diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-09-16 22:42:32 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-09-16 22:42:32 +0200 |
| commit | e35711ddde8f5e9f94d4b5145662877619ceecd4 (patch) | |
| tree | 16b5b18a4c14860bccd591d4b8a0d7a2ab833868 /phpBB/includes/session.php | |
| parent | 4d5d50001d00390b8255da736e67e38d83c8bed5 (diff) | |
| parent | 46810f874758516a8b5ce0fc680f05b612f70f60 (diff) | |
| download | forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar.gz forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar.bz2 forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar.xz forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.zip | |
Merge branch 'develop-olympus' into develop
* 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()
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 7da72cb6d2..d4eac553e9 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -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'); } |