diff options
| author | Cesar G <prototech91@gmail.com> | 2014-04-12 04:26:51 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-04-23 09:11:41 -0700 |
| commit | f2e74354a34561940c3203f24816af2496b95b0b (patch) | |
| tree | 8cbf4c9611c16216b8ebc67468690cd6f6b55cee | |
| parent | 607698c8844b1f08aef1aca63cd8d981783ef92a (diff) | |
| download | forums-f2e74354a34561940c3203f24816af2496b95b0b.tar forums-f2e74354a34561940c3203f24816af2496b95b0b.tar.gz forums-f2e74354a34561940c3203f24816af2496b95b0b.tar.bz2 forums-f2e74354a34561940c3203f24816af2496b95b0b.tar.xz forums-f2e74354a34561940c3203f24816af2496b95b0b.zip | |
[ticket/10737] Enforce allow_live_searches setting in memberlist.php.
PHPBB3-10737
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 677b228cc6..030559eeb5 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -348,6 +348,7 @@ $lang = array_merge($lang, array( 'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server.', 'LDAP_SEARCH_FAILED' => 'An error occurred while searching the LDAP directory.', 'LEGEND' => 'Legend', + 'LIVE_SEARCHES_NOT_ALLOWED' => 'Live searches are not allowed.', 'LOADING' => 'Loading', 'LOCATION' => 'Location', 'LOCK_POST' => 'Lock post', diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index acda40c8fb..3d9f4aa028 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -50,6 +50,13 @@ switch ($mode) case 'email': break; + case 'livesearch': + if (!$config['allow_live_searches']) + { + trigger_error('LIVE_SEARCHES_NOT_ALLOWED'); + } + // No break + default: // Can this user view profiles/memberlist? if (!$auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) |