? 696402-context-node-form.patch
? 713526-panels-stacked-tpl-conditions.patch
? 718368-ignore-query-string.patch
? 812744-query-string-still-there.patch
? 827310-hide-disabled-comments.patch
? 853368-field-override-broken.patch
? 867898-clone-edited-item.patch
? 868410-ie-opacity-fix.patch
? 870820.patch
? 872072-customize-modal.patch
? TODO.txt
? auto-guess-type-ajax-element.patch
? comment_links_8.patch
? ctools-853114-docs.patch
? ctools-862320.patch
? ctools-ajax-redirect-with-delayed-optional-check-for-positive-delay.patch
? ctools-custom_content.patch
? ctools-no-base-types-1.patch
? ctools-object-cache.inc-session-handling_0.patch
? ctools_ahah_callback_rebuilds_831922.patch
? ctools_node_build_modes_views_style_0.patch
? export_ui_revert_path.patch
? flexible_css_1.patch
? help/stylizer.html
Index: ctools.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctools/ctools.module,v
retrieving revision 1.27.2.43
diff -u -p -r1.27.2.43 ctools.module
--- ctools.module	5 Aug 2010 22:48:13 -0000	1.27.2.43
+++ ctools.module	10 Aug 2010 22:54:09 -0000
@@ -610,7 +610,6 @@ function ctools_preprocess_page(&$variab
   ctools_process_js_files($js_files, 'footer');
 
   // Go through all CSS files that are being added to the page and catalog them.
-  $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1);
   $css_files = array();
   foreach ($variables['css'] as $media => $types) {
     // If CSS preprocessing is off, we still need to output the styles.
@@ -633,7 +632,7 @@ function ctools_preprocess_page(&$variab
         }
         // Only include the stylesheet if it exists.
         if (file_exists($file)) {
-          $css_files[base_path() . $file . $query_string] = TRUE;
+          $css_files[base_path() . $file] = TRUE;
         }
       }
     }
@@ -905,7 +904,6 @@ function ctools_file_download($filepath)
 function ctools_process_js_files(&$js_files, $scope) {
   // Automatically extract any 'settings' added via drupal_add_js() and make
   // them the first command.
-  $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1);
   $scripts = drupal_add_js(NULL, NULL, $scope);
 
   // Get replacements that are going to be made by contrib modules and take
@@ -933,7 +931,7 @@ function ctools_process_js_files(&$js_fi
         foreach ($data as $path => $info) {
           // If the script is being replaced, take that replacment into account.
           $final_path = isset($replacements[$type][$path]) ? $replacements[$type][$path] : $path;
-          $js_files[base_path() . $final_path . ($info['cache'] ? $query_string : '?' . time())] = TRUE;
+          $js_files[base_path() . $final_path] = TRUE;
         }
     }
   }
Index: js/ajax-responder.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctools/js/ajax-responder.js,v
retrieving revision 1.18.2.19
diff -u -p -r1.18.2.19 ajax-responder.js
--- js/ajax-responder.js	5 Aug 2010 19:03:12 -0000	1.18.2.19
+++ js/ajax-responder.js	10 Aug 2010 22:54:10 -0000
@@ -293,6 +293,19 @@
     return url;
   };
 
+  Drupal.CTools.AJAX.getPath = function (link) {
+    if (!link) {
+      return;
+    }
+
+    var index = link.indexOf('?');
+    if (index != -1) {
+      link = link.substr(0, index);
+    }
+
+    return link;
+  }
+
   Drupal.CTools.AJAX.commands.prepend = function(data) {
     $(data.selector).prepend(data.data);
     Drupal.attachBehaviors($(data.selector));
@@ -359,14 +372,8 @@
     // Build a list of css files already loaded:
     $('link:not(.ctools-temporary-css)').each(function () {
       if ($(this).attr('type') == 'text/css') {
-        var link = $(this).attr('href');
+        var link = Drupal.CTools.AJAX.getPath($(this).attr('href'));
         if (link) {
-          // Strip off the query string; this can change at times and cause us
-          // to include files multiple times.
-          var index = link.indexOf('?');
-          if (index) {
-            link = link.substr(0, index);
-          }
           Drupal.CTools.AJAX.css[link] = $(this).attr('href');
         }
       }
@@ -374,11 +381,7 @@
 
     var html = '';
     for (i in data.argument) {
-      var link = data.argument[i].file;
-      var index = link.indexOf('?');
-      if (index) {
-        link = link.substr(0, index);
-      }
+      var link = Drupal.CTools.AJAX.getPath(data.argument[i].file);
       if (!Drupal.CTools.AJAX.css[link]) {
         html += '<link class="ctools-temporary-css" type="text/css" rel="stylesheet" media="' + data.argument[i].media +
           '" href="' + data.argument[i].file + '" />';
@@ -399,14 +402,8 @@
     // Build a list of scripts already loaded:
     var scripts = {};
     $('script').each(function () {
-      var link = $(this).attr('src');
+      var link = Drupal.CTools.AJAX.getPath($(this).attr('src'));
       if (link) {
-          // Strip off the query string; this can change at times and cause us
-          // to include files multiple times.
-        var index = link.indexOf('?');
-        if (index) {
-          link = link.substr(0, index);
-        }
         Drupal.CTools.AJAX.scripts[link] = $(this).attr('src');
       }
     });
@@ -414,14 +411,9 @@
     var html = '';
     var head = document.getElementsByTagName('head')[0];
     for (i in data.argument) {
-      var link = data.argument[i];
-      var index = link.indexOf('?');
-      if (index) {
-        link = link.substr(0, index);
-      }
-
+      var link = Drupal.CTools.AJAX.getPath(data.argument[i]);
       if (!Drupal.CTools.AJAX.scripts[link]) {
-        Drupal.CTools.AJAX.scripts[data.argument[i]] = link;
+        Drupal.CTools.AJAX.scripts[link] = link;
         // Use this to actually get the script tag into the dom, which is
         // needed for scripts that self-reference to determine paths.
         var script = document.createElement('script');