diff options
| author | Cesar G <prototech91@gmail.com> | 2014-11-08 13:53:45 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-11-08 13:53:45 -0800 |
| commit | c136b4e5fafe6ed398d6dc5ca00735ae2b0a84e8 (patch) | |
| tree | bbf38b6c75809382d513823a1643e38b3020e515 | |
| parent | 1601b61ef923496b8b9f0f13f35023397f2162f3 (diff) | |
| parent | 92c509bc48694ea0fde4b02025dc8135b58d12ed (diff) | |
| download | forums-c136b4e5fafe6ed398d6dc5ca00735ae2b0a84e8.tar forums-c136b4e5fafe6ed398d6dc5ca00735ae2b0a84e8.tar.gz forums-c136b4e5fafe6ed398d6dc5ca00735ae2b0a84e8.tar.bz2 forums-c136b4e5fafe6ed398d6dc5ca00735ae2b0a84e8.tar.xz forums-c136b4e5fafe6ed398d6dc5ca00735ae2b0a84e8.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13265] Don't show link to edit own profile to those without permission
| -rw-r--r-- | phpBB/memberlist.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 4f31178ffb..5a5be6f761 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -681,7 +681,7 @@ switch ($mode) 'U_MCP_QUEUE' => ($auth->acl_getf_global('m_approve')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue', true, $user->session_id) : '', 'U_SWITCH_PERMISSIONS' => ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_id) ? append_sid("{$phpbb_root_path}ucp.$phpEx", "mode=switch_perm&u={$user_id}&hash=" . generate_link_hash('switchperm')) : '', - 'U_EDIT_SELF' => ($user_id == $user->data['user_id']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_profile&mode=profile_info') : '', + 'U_EDIT_SELF' => ($user_id == $user->data['user_id'] && $auth->acl_get('u_chgprofileinfo')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_profile&mode=profile_info') : '', 'S_USER_NOTES' => ($user_notes_enabled) ? true : false, 'S_WARN_USER' => ($warn_user_enabled) ? true : false, |