Changeset 10466 for trunk/wp-admin/load-scripts.php

Timestamp:

01/30/2009 01:45:05 PM (18 years ago)

Author:

azaozz

Message:

Support output_handler = ob_gzhandler in script/style compressor, props DD32, fixes #9000

File:

• trunk/wp-admin/load-scripts.php (modified) (2 diffs)

trunk/wp-admin/load-scripts.php

@@ -90 +90 @@
 
 if ( isset($_GET['test']) && 1 == $_GET['test'] ) {
-        if ( ini_get('zlib.output_compression') )
+        if ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') )
                 exit('');
 
@@ -144 +144 @@
 header("Cache-Control: public, max-age=$expires_offset");
         
-if ( $compress && ! ini_get('zlib.output_compression') ) {
+if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') ) {
         header('Vary: Accept-Encoding'); // Handle proxies
         if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {