aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-11-08 13:53:11 -0800
committerCesar G <prototech91@gmail.com>2014-11-08 13:53:11 -0800
commit92c509bc48694ea0fde4b02025dc8135b58d12ed (patch)
treef0efcc73a69d1ceb4e6c144c99b68fc726cf7e93
parent778e0e06f3cc10915fadf5ecd4e2d5ba2339c982 (diff)
parent307fa831d67cf92a86908e42dc1a4b62751acb0d (diff)
downloadforums-92c509bc48694ea0fde4b02025dc8135b58d12ed.tar
forums-92c509bc48694ea0fde4b02025dc8135b58d12ed.tar.gz
forums-92c509bc48694ea0fde4b02025dc8135b58d12ed.tar.bz2
forums-92c509bc48694ea0fde4b02025dc8135b58d12ed.tar.xz
forums-92c509bc48694ea0fde4b02025dc8135b58d12ed.zip
Merge remote-tracking branch 'Elsensee/ticket/13265' into develop-ascraeus
* Elsensee/ticket/13265: [ticket/13265] Don't show link to edit own profile to those without permission
-rw-r--r--phpBB/memberlist.php2
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&amp;u={$user_id}&amp;hash=" . generate_link_hash('switchperm')) : '',
- 'U_EDIT_SELF' => ($user_id == $user->data['user_id']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_profile&amp;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&amp;mode=profile_info') : '',
'S_USER_NOTES' => ($user_notes_enabled) ? true : false,
'S_WARN_USER' => ($warn_user_enabled) ? true : false,