Skip to content
Snippets Groups Projects
Commit 2eea2c61 authored by Andreas Gohr's avatar Andreas Gohr
Browse files

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.
parents 8b349168 0f8f7aaa
No related branches found
No related tags found
No related merge requests found
......@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment