diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-12-03 18:03:33 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-12-03 18:03:33 +0000 |
| commit | 9d9624a88624ca8850d6fcae60022a6ed9f754fc (patch) | |
| tree | b11d737312e18580d858fb6b16b1cf6e3e678a58 /phpBB/includes/session.php | |
| parent | 3d38552c6918b5e3b94c885d1c6ff338380528d9 (diff) | |
| download | forums-9d9624a88624ca8850d6fcae60022a6ed9f754fc.tar forums-9d9624a88624ca8850d6fcae60022a6ed9f754fc.tar.gz forums-9d9624a88624ca8850d6fcae60022a6ed9f754fc.tar.bz2 forums-9d9624a88624ca8850d6fcae60022a6ed9f754fc.tar.xz forums-9d9624a88624ca8850d6fcae60022a6ed9f754fc.zip | |
- author search should use clean names for searching [Bug #5752]
- local moderators are moderators too!
- don't show a "word is not contained in any post" message for ignored common words
- bold search words in search error messages [Bug #5762]
git-svn-id: file:///svn/phpbb/trunk@6708 89ea8834-ac86-4346-8a33-228a782c2dd0
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 80d66291d7..de78969c3f 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1218,7 +1218,7 @@ class user extends session if (!defined('DEBUG_EXTRA') && !defined('ADMIN_START') && !defined('IN_INSTALL') && !defined('IN_LOGIN') && file_exists($phpbb_root_path . 'install')) { // Adjust the message slightly according to the permissions - if ($auth->acl_gets('a_', 'm_')) + if ($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) { $message = 'REMOVE_INSTALL'; } @@ -1231,7 +1231,7 @@ class user extends session } // Is board disabled and user not an admin or moderator? - if ($config['board_disable'] && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_')) + if ($config['board_disable'] && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) { $message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE'; trigger_error($message); @@ -1240,7 +1240,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') && !$auth->acl_gets('a_', 'm_')) + if ($this->load > floatval($config['limit_load']) && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_') && !$auth->acl_gets('a_', 'm_')) { trigger_error('BOARD_UNAVAILABLE'); } |