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

Timestamp:

02/01/2009 09:45:24 AM (16 years ago)

Author:

azaozz

Message:

Detect when the server compresses output, see #8628

File:

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

trunk/wp-includes/script-loader.php

@@ -617 +617 @@
 
     global $wp_scripts;
-    
+
     if ( !is_a($wp_scripts, 'WP_Scripts') )
         return array(); // no need to run if nothing is queued
-    
+
     return print_head_scripts();
 }
@@ -635 +635 @@
 /**
  * Wrapper for do_action('wp_enqueue_scripts')
- *  
+ *
  * Allows plugins to queue scripts for the front end using wp_enqueue_script().
  * Runs first in wp_head() where all is_home(), is_page(), etc. functions are available.
@@ -679 +679 @@
     global $concatenate_scripts, $compress_scripts, $compress_css;
 
+    $compressed_output = ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') );
+
     if ( ! isset($concatenate_scripts) ) {
         $concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
@@ -687 +689 @@
     if ( ! isset($compress_scripts) ) {
         $compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
-        if ( $compress_scripts && ! get_option('can_compress_scripts') )
+        if ( $compress_scripts && ( ! get_option('can_compress_scripts') || $compressed_output ) )
             $compress_scripts = false;
     }
@@ -693 +695 @@
     if ( ! isset($compress_css) ) {
         $compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
-        if ( $compress_css && ! get_option('can_compress_scripts') )
+        if ( $compress_css && ( ! get_option('can_compress_scripts') || $compressed_output ) )
             $compress_css = false;
     }