diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-22 15:07:01 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-22 15:07:01 +0100 |
| commit | 5197e5afe387e331a80c39db4fa524562f615b97 (patch) | |
| tree | d3585544a172801bdbf5dda6ce80aa41b19d5a96 | |
| parent | bdab6dede016854d65f31ae869924ac9f7e98ce9 (diff) | |
| parent | 663eb74cf3bb789c0916be2d3bc2c00eb5f4f8b5 (diff) | |
| download | forums-5197e5afe387e331a80c39db4fa524562f615b97.tar forums-5197e5afe387e331a80c39db4fa524562f615b97.tar.gz forums-5197e5afe387e331a80c39db4fa524562f615b97.tar.bz2 forums-5197e5afe387e331a80c39db4fa524562f615b97.tar.xz forums-5197e5afe387e331a80c39db4fa524562f615b97.zip | |
Merge remote-tracking branch 'geetakshi/ticket/12035' into develop-olympus
* geetakshi/ticket/12035:
[ticket/12035] Correcting the condition
[ticket/12035] Adding necessary conditions
[ticket/12035] Adding link to user posts to ACP page
| -rw-r--r-- | phpBB/adm/style/acp_users_overview.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index ba350a13fb..964d6e5c17 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -30,7 +30,7 @@ </dl> <dl> <dt><label>{L_POSTS}:</label></dt> - <dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd> + <dd><strong><!-- IF USER_HAS_POSTS and U_SEARCH_USER --><a href="{U_SEARCH_USER}">{USER_POSTS}</a><!-- ELSE -->{USER_POSTS}<!-- ENDIF --></strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd> </dl> <dl> <dt><label>{L_WARNINGS}:</label></dt> diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 61d08a49cf..8aaefb02c5 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1037,6 +1037,7 @@ class acp_users 'U_SHOW_IP' => $this->u_action . "&u=$user_id&ip=" . (($ip == 'ip') ? 'hostname' : 'ip'), 'U_WHOIS' => $this->u_action . "&action=whois&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' => ($config['load_search'] && $auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$user_row['user_id']}&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&u={$user_row['user_id']}&hash=" . generate_link_hash('switchperm')) : '', |