? advagg-1066974.patch
Index: advagg_js_compress/advagg_js_compress.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/advagg/advagg_js_compress/advagg_js_compress.module,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 advagg_js_compress.module
--- advagg_js_compress/advagg_js_compress.module	22 Feb 2011 23:59:23 -0000	1.1.2.2
+++ advagg_js_compress/advagg_js_compress.module	24 Feb 2011 09:40:36 -0000
@@ -31,6 +31,33 @@ function advagg_js_compress_init() {
 }
 
 /**
+ * Implement hook_advagg_js_pre_alter.
+ */
+function advagg_js_compress_advagg_js_pre_alter(&$javascript) {
+//   watchdog('ss', str_replace('    ', '    ', nl2br(htmlentities(print_r($javascript, TRUE)))));
+//   return;
+
+  foreach ($javascript as $type => $data) {
+    if (!$data) {
+      continue;
+    }
+    if ($type == 'setting' || $type == 'inline') {
+      continue;
+    }
+    foreach ($data as $path => $info) {
+      if (!module_exists('jquery_update')) {
+        $file_path = drupal_get_path('module', 'advagg_js_compress');
+        if ($path == 'misc/jquery.form.js') {
+          $new_path = $file_path . '/jquery.form.js';
+          $javascript[$type][$new_path] = $info;
+          unset($javascript[$type][$path]);
+        }
+      }
+    }
+  }
+}
+
+/**
  * Implement hook_advagg_js_alter.
  */
 function advagg_js_compress_advagg_js_alter(&$contents, $files) {
@@ -82,8 +109,15 @@ function advagg_js_compress_advagg_js_al
  *   TRUE if all files are compressable. List of files that failed otherwise.
  */
 function advagg_js_compress_test_compression($files_to_test) {
+  global $base_path;
   $bad_files = array();
   foreach ($files_to_test as $info) {
+    $key = variable_get('advagg_js_compress_url_key', FALSE);
+    if (empty($key)) {
+      $key = mt_rand();
+      variable_set('advagg_js_compress_url_key', $key);
+    }
+
     // Setup request URL and headers.
     $query['values'] = $info;
     $query['key'] = $key;
@@ -92,7 +126,7 @@ function advagg_js_compress_test_compres
     if (empty($ip)) {
       $ip = $_SERVER['SERVER_ADDR'];
     }
-    $url = 'http://' . $ip . $base_path . '/advagg_js_compress_test_file.php';
+    $url = 'http://' . $ip . $base_path . 'advagg_js_compress_test_file.php';
     $headers = array(
       'Host' => $_SERVER['HTTP_HOST'],
       'Content-Type' => 'application/x-www-form-urlencoded',