diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-10-29 15:13:33 -0400 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-10-29 15:13:33 -0400 |
| commit | 88b100d818940340e660c9f372526b1b5466bf3a (patch) | |
| tree | 98125d2b2017cdd55c3a035160c74bb71d7c317b | |
| parent | c84268d2f9a758a3bcc570acc60c01e1185eeb14 (diff) | |
| parent | 5f5d395c625fe0257e7bca5d787424808f7649cc (diff) | |
| download | forums-88b100d818940340e660c9f372526b1b5466bf3a.tar forums-88b100d818940340e660c9f372526b1b5466bf3a.tar.gz forums-88b100d818940340e660c9f372526b1b5466bf3a.tar.bz2 forums-88b100d818940340e660c9f372526b1b5466bf3a.tar.xz forums-88b100d818940340e660c9f372526b1b5466bf3a.zip | |
Merge remote-tracking branch 'p/ticket/11158' into develop-olympus
* p/ticket/11158:
[ticket/11158] Require acl_u_sig for ucp signature module.
[ticket/11158] Revert old fix in PHPBB3-10186.
| -rw-r--r-- | phpBB/includes/ucp/info/ucp_profile.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 12 | ||||
| -rw-r--r-- | phpBB/ucp.php | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/info/ucp_profile.php b/phpBB/includes/ucp/info/ucp_profile.php index d19b80f4c0..4591776768 100644 --- a/phpBB/includes/ucp/info/ucp_profile.php +++ b/phpBB/includes/ucp/info/ucp_profile.php @@ -21,7 +21,7 @@ class ucp_profile_info 'version' => '1.0.0', 'modes' => array( 'profile_info' => array('title' => 'UCP_PROFILE_PROFILE_INFO', 'auth' => '', 'cat' => array('UCP_PROFILE')), - 'signature' => array('title' => 'UCP_PROFILE_SIGNATURE', 'auth' => '', '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/install/database_update.php b/phpBB/install/database_update.php index 40837145ba..099ab6aeb5 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1005,6 +1005,8 @@ function database_update_info() ), // No changes from 3.0.11-RC2 to 3.0.11 '3.0.11-RC2' => array(), + // No changes from 3.0.11 to 3.0.12-RC1 + '3.0.11' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */ ); @@ -2108,6 +2110,16 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.11-RC2 to 3.0.11 case '3.0.11-RC2': break; + + // Changes from 3.0.11 to 3.0.12-RC1 + case '3.0.11': + $sql = 'UPDATE ' . MODULES_TABLE . ' + SET module_auth = \'acl_u_sig\' + WHERE module_class = \'ucp\' + AND module_basename = \'profile\' + AND module_mode = \'signature\''; + _sql($sql, $errored, $error_ary); + break; } } diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 45caeb12ea..520ab3caad 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -320,12 +320,6 @@ if (!$config['allow_topic_notify'] && !$config['allow_forum_notify']) $module->set_display('main', 'subscribed', false); } -// Do not display signature panel if not authed to do so -if (!$auth->acl_get('u_sig')) -{ - $module->set_display('profile', 'signature', false); -} - // Select the active module $module->set_active($id, $mode); |