fix gzip

gburton · Jul 24, 2019 · c7e38fc · c7e38fc
1 parent 88db268
commit c7e38fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 55 deletions.
diff --git a/includes/application_bottom.php b/includes/application_bottom.php
@@ -23,8 +23,4 @@
       echo '<span class="smallText">Parse Time: ' . $parse_time . 's</span>';
     }
   }
-
-  if ( (GZIP_COMPRESSION == 'true') && ($ext_zlib_loaded == true) && ($ini_zlib_output_compression < 1) ) {
-    tep_gzip_output(GZIP_LEVEL);
-  }
 ?>
diff --git a/includes/application_top.php b/includes/application_top.php
@@ -62,12 +62,14 @@
   }
 
 // if gzip_compression is enabled, start to buffer the output
-  if ( (GZIP_COMPRESSION == 'true') && ($ext_zlib_loaded = extension_loaded('zlib')) && !headers_sent() ) {
-    if (($ini_zlib_output_compression = (int)ini_get('zlib.output_compression')) < 1) {
-      ob_start('ob_gzhandler');
-    } elseif (function_exists('ini_set')) {
+  if ( (GZIP_COMPRESSION == 'true') && extension_loaded('zlib') && !headers_sent() ) {
+    if (function_exists('ini_set')) {
       ini_set('zlib.output_compression_level', GZIP_LEVEL);
     }
+
+    if ((int)ini_get('zlib.output_compression') < 1) {
+      ob_start('ob_gzhandler');
+    }
   }
 
 // set the HTTP GET parameters manually if search_engine_friendly_urls is enabled

diff --git a/includes/functions/gzip_compression.php b/includes/functions/gzip_compression.php