diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-11-03 09:50:15 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-11-03 09:50:15 +0100 |
| commit | 2eea2c61bafe542219a86d027f76af8650cb5f6e (patch) | |
| tree | 78926905a46b0a40560b45a5b7beb07a327e8cbe | |
| parent | 8b34916885f5b18154f9b1873dcbcc7a12237960 (diff) | |
| parent | 0f8f7aaa42dc1e95a0d7a1cac126263bdb17686b (diff) | |
| download | rpg-2eea2c61bafe542219a86d027f76af8650cb5f6e.tar.gz rpg-2eea2c61bafe542219a86d027f76af8650cb5f6e.tar.bz2 | |
Merge pull request #917 from danny0838/master
Fixed a bug that $conf['compression'] is turned off when gzopen doesn't exist and gzopen64 does exist.
| -rw-r--r-- | inc/init.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/inc/init.php b/inc/init.php index 24920a17d..d0d9101e6 100644 --- a/inc/init.php +++ b/inc/init.php @@ -178,14 +178,6 @@ $_REQUEST = array_merge($_GET,$_POST); // we don't want a purge URL to be digged if(isset($_REQUEST['purge']) && !empty($_SERVER['HTTP_REFERER'])) unset($_REQUEST['purge']); -// disable gzip if not available -if($conf['compression'] == 'bz2' && !function_exists('bzopen')){ - $conf['compression'] = 'gz'; -} -if($conf['compression'] == 'gz' && !function_exists('gzopen')){ - $conf['compression'] = 0; -} - // precalculate file creation modes init_creationmodes(); @@ -201,6 +193,14 @@ if (empty($plugin_controller_class)) $plugin_controller_class = 'Doku_Plugin_Con // load libraries require_once(DOKU_INC.'inc/load.php'); +// disable gzip if not available +if($conf['compression'] == 'bz2' && !function_exists('bzopen')){ + $conf['compression'] = 'gz'; +} +if($conf['compression'] == 'gz' && !function_exists('gzopen')){ + $conf['compression'] = 0; +} + // input handle class global $INPUT; $INPUT = new Input(); |