Changeset 5810

Show
Ignore:
Timestamp:
07/18/07 21:12:22 (10 months ago)
Author:
westi
Message:

Only enable gzip compression if it is not enabled in php.ini. Fixes #4426

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/functions.php

    r5801 r5810  
    395395 
    396396function gzip_compression() { 
    397     if ( !get_option('gzipcompression') ) return false; 
    398  
    399     if ( extension_loaded('zlib') ) { 
    400         ob_start('ob_gzhandler'); 
     397    if ( !get_option( 'gzipcompression' ) ) { 
     398        return false; 
     399    } 
     400 
     401    if ( ( ini_get( 'zlib.output_compression' ) == 'On' || ini_get( 'zlib.output_compression_level' ) > 0 ) || ini_get( 'output_handler' ) == 'ob_gzhandler' ) { 
     402        return false; 
     403    } 
     404     
     405    if ( extension_loaded( 'zlib' ) ) { 
     406        ob_start( 'ob_gzhandler' ); 
    401407    } 
    402408}