Changeset 10372 for trunk/wp-includes/script-loader.php

Timestamp:

01/17/2009 02:08:15 PM (17 years ago)

Author:

azaozz

Message:

Use gzip instead of deflate as more servers seem to understand it, add separate switch for disabling CSS compression

File:

• trunk/wp-includes/script-loader.php (modified) (6 diffs)

trunk/wp-includes/script-loader.php

@@ -597 +597 @@
 
         $ver = md5("$wp_scripts->concat" . "$wp_scripts->concat_version");
-        $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&load=" . rtrim($wp_scripts->concat, ',') . "&ver=$ver";
+        $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&load=" . rtrim($wp_scripts->concat, ',') . "&ver=$ver";
         echo "<script type='text/javascript' src='$src'></script>\n";
     }
@@ -607 +607 @@
 
 function wp_print_admin_styles() {
-    global $wp_styles, $concatenate_scripts, $compress_scripts;
+    global $wp_styles, $concatenate_scripts, $compress_css;
 
     if ( !is_a($wp_styles, 'WP_Styles') )
@@ -616 +616 @@
 
     $wp_styles->do_concat = $concatenate_scripts;
-    $zip = $compress_scripts ? 1 : 0;
+    $zip = $compress_css ? 1 : 0;
 
     $wp_styles->do_items(false);
@@ -624 +624 @@
             $ver = md5("$wp_styles->concat" . "$wp_styles->concat_version");
             $rtl = 'rtl' === $wp_styles->text_direction ? 1 : 0;
-            $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&amp;rtl={$rtl}&amp;load=" . rtrim($wp_styles->concat, ',') . "&amp;ver=$ver";
+            $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&rtl={$rtl}&load=" . rtrim($wp_styles->concat, ',') . "&ver=$ver";
             echo "<link rel='stylesheet' href='$href' type='text/css' media='all' />\n";
         }
@@ -638 +638 @@
 
 function script_concat_settings() {
-    global $concatenate_scripts, $compress_scripts;
+    global $concatenate_scripts, $compress_scripts, $compress_css;
 
     $concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
@@ -647 +647 @@
     if ( $compress_scripts && ! get_option('can_compress_scripts') )
         $compress_scripts = false;
+
+    $compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
+    if ( $compress_css && ! get_option('can_compress_scripts') )
+        $compress_css = false;
 }