Don't bother making gzencoded version of combined CSS/JS if zlib.output_compression=On

1 files changed, 4 insertions, 1 deletions

diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 133066d7..4b85f2f0 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -104,7 +104,10 @@ class Gallery_View_Core extends View {
       }
 
       $cache->set($key, $contents, array($type), 30 * 84600);
-      if (function_exists("gzencode")) {
+
+      $use_gzip = function_exists("gzencode") &&
+        (int) ini_get("zlib.output_compression") === 0;
+      if ($use_gzip) {
         $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
                     array($type, "gzip"), 30 * 84600);
       }