Changeset 5372

Timestamp:

05/02/2007 02:36:44 AM (17 years ago)

Author:

rob1n

Message:

Don't double encode gzip output if gzip is already set in php.ini. Props welcomb. fixes #4205 for 2.2

File:

• branches/2.2/wp-includes/js/tinymce/tiny_mce_gzip.php (modified) (1 diff)

branches/2.2/wp-includes/js/tinymce/tiny_mce_gzip.php

@@ -85 +85 @@
         $encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
 
-    if ((in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) {
+    if ((in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression') && ini_get('output_handler') != 'ob_gzhandler') {
         $enc = in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
         $supportsGzip = true;