aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorRuslan Uzdenov <rxu@mail.ru>2009-07-08 14:30:01 +0000
committerRuslan Uzdenov <rxu@mail.ru>2009-07-08 14:30:01 +0000
commit61453bb2aba7c1acfedab0ea600c9d13ee751976 (patch)
tree1dbaafb7d87966e70e4ff28391e6bc41154829fd /phpBB/includes
parentcc1b91bb92612fcc84bb48e3d690ab4362d3c149 (diff)
downloadforums-61453bb2aba7c1acfedab0ea600c9d13ee751976.tar
forums-61453bb2aba7c1acfedab0ea600c9d13ee751976.tar.gz
forums-61453bb2aba7c1acfedab0ea600c9d13ee751976.tar.bz2
forums-61453bb2aba7c1acfedab0ea600c9d13ee751976.tar.xz
forums-61453bb2aba7c1acfedab0ea600c9d13ee751976.zip
Fixed Bug #24075 - GZIP status is not showed up correctly in debug mode
Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9737 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_main.php2
-rw-r--r--phpBB/includes/functions.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index e0d6a3f01c..f9d611f8db 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -485,7 +485,7 @@ class acp_main
'UPLOAD_DIR_SIZE' => $upload_dir_size,
'TOTAL_ORPHAN' => $total_orphan,
'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true,
- 'GZIP_COMPRESSION' => ($config['gzip_compress']) ? $user->lang['ON'] : $user->lang['OFF'],
+ 'GZIP_COMPRESSION' => ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'],
'DATABASE_INFO' => $db->sql_server_info(),
'BOARD_VERSION' => $config['version'],
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c6f6084918..60fe6a454f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3927,7 +3927,7 @@ function page_footer($run_cron = true)
$db->sql_report('display');
}
- $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime);
+ $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress'] && @extension_loaded('zlib')) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime);
if ($auth->acl_get('a_') && defined('DEBUG_EXTRA'))
{