Merge branch 'ticket/nickvergessen/9782' into develop-olympus

* ticket/nickvergessen/9782:
  [ticket/9782] Board disable radio set on when server load high
This commit is contained in:
Andreas Fischer 2010-08-20 22:11:04 +02:00
commit 31144ed4c5

View file

@ -1831,7 +1831,7 @@ class user extends session
// Is load exceeded? // Is load exceeded?
if ($config['limit_load'] && $this->load !== false) 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 // Set board disabled to true to let the admins/mods get the proper notification
$config['board_disable'] = '1'; $config['board_disable'] = '1';