Commit c69f19bd authored by Dave Reid's avatar Dave Reid Committed by Henrik Danielsson
Browse files

- #2679106 by Dave Reid, Wim Leers, naxoc, Liam Morland: CKEditor uses... 

- #2679106 by Dave Reid, Wim Leers, naxoc, Liam Morland: CKEditor uses separate cache-busting query string from Drupal's
parent c6c8b944

editors/ckeditor.inc

+3 −0
Changes for editors/ckeditor.inc: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -444,6 +444,9 @@ function wysiwyg_ckeditor_settings_form_validate_stylessets($element, &$form_sta 
 *   script is loaded.

 */

function wysiwyg_ckeditor_init($editor) {

  // Pass Drupal's JS cache-busting string via settings along to CKEditor.

  drupal_add_js(array('wysiwyg' => array('ckeditor' => array('timestamp' => variable_get('css_js_query_string', '0')))), 'setting');



  // CKEditor unconditionally searches for its library filename in SCRIPT tags

  // on the page upon loading the library in order to determine the base path to

  // itself. When JavaScript aggregation is enabled, this search fails and all

editors/js/ckeditor-3.0.js

+6 −0
Changes for editors/js/ckeditor-3.0.js: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ var instanceMap; 
 */

Drupal.wysiwyg.editor.init.ckeditor = function(settings, pluginInfo) {

  instanceMap = {};



  // Manually set the cache-busting string to the same value as Drupal.

  if (Drupal.settings.wysiwyg.ckeditor.hasOwnProperty('timestamp')) {

    CKEDITOR.timestamp = Drupal.settings.wysiwyg.ckeditor.timestamp;

  }



  // Nothing to do here other than register new plugins etc.

  Drupal.wysiwyg.editor.update.ckeditor(settings, pluginInfo);

};