diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-20 22:11:04 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-20 22:11:04 +0200 |
| commit | 31144ed4c5b14e25b2188ae06d841ff935ac4290 (patch) | |
| tree | bde7337ba82419bdd607c95ef86a225c18db686f /phpBB/includes | |
| parent | de8c334aeb0652b70c164e26056eddb164b29e86 (diff) | |
| parent | 932b35ab7a9f586e6a9b00416a8f4caf47e39630 (diff) | |
| download | forums-31144ed4c5b14e25b2188ae06d841ff935ac4290.tar forums-31144ed4c5b14e25b2188ae06d841ff935ac4290.tar.gz forums-31144ed4c5b14e25b2188ae06d841ff935ac4290.tar.bz2 forums-31144ed4c5b14e25b2188ae06d841ff935ac4290.tar.xz forums-31144ed4c5b14e25b2188ae06d841ff935ac4290.zip | |
Merge branch 'ticket/nickvergessen/9782' into develop-olympus
* ticket/nickvergessen/9782:
[ticket/9782] Board disable radio set on when server load high
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/session.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index e157053e61..79023cc7bc 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1831,7 +1831,7 @@ class user extends session // Is load exceeded? if ($config['limit_load'] && $this->load !== false) { - if ($this->load > floatval($config['limit_load']) && !defined('IN_LOGIN')) + if ($this->load > floatval($config['limit_load']) && !defined('IN_LOGIN') && !defined('IN_ADMIN')) { // Set board disabled to true to let the admins/mods get the proper notification $config['board_disable'] = '1'; |