From 9d9624a88624ca8850d6fcae60022a6ed9f754fc Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 3 Dec 2006 18:03:33 +0000 Subject: - 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 --- phpBB/includes/session.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/includes/session.php') 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'); } -- cgit v1.2.1