diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-07 08:32:13 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-07 08:32:13 -0500 |
| commit | b0948fb3470056b14a743dcfeb59aea0f35d0029 (patch) | |
| tree | 27623997067385f23c35220c9a664557fb568fe5 /phpBB/includes | |
| parent | 2364d4b2172c9f54520f04001b29c517d7138b69 (diff) | |
| parent | c23d2457e9be616bfa83aebc5e743130b6c69624 (diff) | |
| download | forums-b0948fb3470056b14a743dcfeb59aea0f35d0029.tar forums-b0948fb3470056b14a743dcfeb59aea0f35d0029.tar.gz forums-b0948fb3470056b14a743dcfeb59aea0f35d0029.tar.bz2 forums-b0948fb3470056b14a743dcfeb59aea0f35d0029.tar.xz forums-b0948fb3470056b14a743dcfeb59aea0f35d0029.zip | |
Merge PR #607 branch 'nickvergessen/ticket/10679' into develop
* nickvergessen/ticket/10679:
[ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
[ticket/10679] Use module_auth to limit access to the module
[ticket/10679] Add new permission for changing profile field information
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/info/ucp_profile.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/info/ucp_profile.php b/phpBB/includes/ucp/info/ucp_profile.php index 201216e9fd..3581a7f533 100644 --- a/phpBB/includes/ucp/info/ucp_profile.php +++ b/phpBB/includes/ucp/info/ucp_profile.php @@ -19,7 +19,7 @@ class ucp_profile_info 'title' => 'UCP_PROFILE', 'version' => '1.0.0', 'modes' => array( - 'profile_info' => array('title' => 'UCP_PROFILE_PROFILE_INFO', 'auth' => '', 'cat' => array('UCP_PROFILE')), + 'profile_info' => array('title' => 'UCP_PROFILE_PROFILE_INFO', 'auth' => 'acl_u_chgprofileinfo', 'cat' => array('UCP_PROFILE')), 'signature' => array('title' => 'UCP_PROFILE_SIGNATURE', 'auth' => 'acl_u_sig', 'cat' => array('UCP_PROFILE')), 'avatar' => array('title' => 'UCP_PROFILE_AVATAR', 'auth' => 'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)', 'cat' => array('UCP_PROFILE')), 'reg_details' => array('title' => 'UCP_PROFILE_REG_DETAILS', 'auth' => '', 'cat' => array('UCP_PROFILE')), diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 89bf20a30f..e7cea06a45 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -251,6 +251,11 @@ class ucp_profile break; case 'profile_info': + // Do not display profile information panel if not authed to do so + if (!$auth->acl_get('u_chgprofileinfo')) + { + trigger_error('NO_AUTH_PROFILEINFO'); + } include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx); |