aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorgeetakshi <geetakshi.19@gmail.com>2014-03-20 03:36:53 +0530
committergeetakshi <geetakshi.19@gmail.com>2014-03-20 03:36:53 +0530
commit5316c32b10114f853863eaa85a7afb9add903b23 (patch)
treebdcb07807b23b594a55898a1469754d52c7fbeb2 /phpBB/includes
parent418034af0eb305a52fac990ce83e27f09524cfce (diff)
downloadforums-5316c32b10114f853863eaa85a7afb9add903b23.tar
forums-5316c32b10114f853863eaa85a7afb9add903b23.tar.gz
forums-5316c32b10114f853863eaa85a7afb9add903b23.tar.bz2
forums-5316c32b10114f853863eaa85a7afb9add903b23.tar.xz
forums-5316c32b10114f853863eaa85a7afb9add903b23.zip
[ticket/12035] Adding necessary conditions
PHPBB3-12035
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_users.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 97bf850f6e..4747b04324 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1037,7 +1037,7 @@ class acp_users
'U_SHOW_IP' => $this->u_action . "&amp;u=$user_id&amp;ip=" . (($ip == 'ip') ? 'hostname' : 'ip'),
'U_WHOIS' => $this->u_action . "&amp;action=whois&amp;user_ip={$user_row['user_ip']}",
'U_MCP_QUEUE' => ($auth->acl_getf_global('m_approve')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue', true, $user->session_id) : '',
- 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$user_row['user_id']}&amp;sr=posts") : '',
+ 'U_SEARCH_USER' => ($auth->acl_get('u_search') && $config['load_search']) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$user_row['user_id']}&amp;sr=posts") : '',
'U_SWITCH_PERMISSIONS' => ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_row['user_id']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", "mode=switch_perm&amp;u={$user_row['user_id']}&amp;hash=" . generate_link_hash('switchperm')) : '',