mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

merge...

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8610 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-06-05 14:11:42 +00:00
parent ea3eb9e9c3
commit 8822747b91
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_ban.php
View File

@@ -97,7 +97,7 @@ class acp_ban
break;
}
$this->display_ban_options($mode);
self::display_ban_options($mode);
$template->assign_vars(array(
'L_TITLE' => $this->page_title,

8
phpBB/includes/functions.php
View File

@@ -2915,15 +2915,15 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
{
// flush the content, else we get a white page if output buffering is on
if (strtolower(@ini_get('output_buffering')) !== 'off')
if ((int) @ini_get('output_buffering') === 1 || strtolower(@ini_get('output_buffering')) === 'on')
{
@ob_end_flush();
@ob_flush();
}
// Another quick fix for those having gzip compression enabled
// Another quick fix for those having gzip compression enabled, but do not flush if the coder wants to catch "something". ;)
if ($config['gzip_compress'])
{
if (@extension_loaded('zlib') && !headers_sent())
if (@extension_loaded('zlib') && !headers_sent() && !ob_get_level())
{
@ob_flush();
}

2
phpBB/includes/mcp/mcp_ban.php
View File

@@ -158,7 +158,7 @@ class mcp_ban
// As a "service" we will check if any post id is specified and populate the username of the poster id if given
$post_id = request_var('p', 0);
$user_id = request_var('u', 0);
$username = false;
$username = $pre_fill = false;
if ($user_id && $user_id <> ANONYMOUS)
{

2
phpBB/includes/mcp/mcp_queue.php
View File

@@ -74,7 +74,7 @@ class mcp_queue
$this->tpl_name = 'mcp_post';
$user->add_lang('posting');
$user->add_lang(array('posting', 'viewtopic'));
$post_id = request_var('p', 0);
$topic_id = request_var('t', 0);