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

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/9609] Change header() calls setting HTTP status to send_status_line().
  [ticket/9613] Slightly update language strings.
  [ticket/9613] Fix missing database part for unread posts search load switch.
  [ticket/9613] Implement a load switch for unread posts search feature.
  [ticket/9785] Allow users to request new passwords when board is disabled.
  [ticket/9644] Check $mode before calling user_notification() from submit_post()
This commit is contained in:
Igor Wiedler
2010-09-16 22:42:32 +02:00
parent 4d5d50001d 46810f8747
commit e35711ddde
13 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/session.php
View File

@@ -748,7 +748,7 @@ class session
if ((int) $row['sessions'] > (int) $config['active_sessions'])
{
header('HTTP/1.1 503 Service Unavailable');
send_status_line(503, 'Service Unavailable');
trigger_error('BOARD_UNAVAILABLE');
}
}
@@ -1821,7 +1821,7 @@ class user extends session
{
if ($this->data['is_bot'])
{
header('HTTP/1.1 503 Service Unavailable');
send_status_line(503, 'Service Unavailable');
}
$message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
@@ -1840,7 +1840,7 @@ class user extends session
{
if ($this->data['is_bot'])
{
header('HTTP/1.1 503 Service Unavailable');
send_status_line(503, 'Service Unavailable');
}
trigger_error('BOARD_UNAVAILABLE');
}