2 files changed, 8 insertions, 4 deletions

diff --git a/inc/init.php b/inc/init.php
index 00d6a6a90..4289e30a9 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -60,6 +60,14 @@
   // make session rewrites XHTML compliant
   @ini_set('arg_separator.output', '&');
 
+  // enable gzip compression
+  if ($conf['gzip_output'] &&
+      !defined('DOKU_DISABLE_GZIP_OUTPUT') &&
+      function_exists('ob_gzhandler') &&
+      preg_match('/gzip|deflate/', $_SERVER['HTTP_ACCEPT_ENCODING'])) {
+    ob_start('ob_gzhandler');
+  }
+
   // init session
   if (!headers_sent() && !defined('NOSESSION')){
     session_name("DokuWiki");
diff --git a/inc/template.php b/inc/template.php
index 7a7e751a9..e79b312db 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -19,10 +19,6 @@
 function template($tpl){
   global $conf;
 
-  if ($conf['gzip_output'] && extension_loaded('zlib') && preg_match('/gzip|deflate/', $_SERVER['HTTP_ACCEPT_ENCODING'])) {
-    ob_start('ob_gzhandler');
-  }
-
   if(@is_readable(DOKU_INC.'lib/tpl/'.$conf['template'].'/'.$tpl))
     return DOKU_INC.'lib/tpl/'.$conf['template'].'/'.$tpl;