makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'p/ticket/11158' into develop-olympus

Browse source 
* p/ticket/11158:
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.
This commit is contained in:
Andreas Fischer 2012-10-29 15:13:33 -04:00
commit 88b100d818
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/ucp/info/ucp_profile.php
View file

@ -21,7 +21,7 @@ class ucp_profile_info
'version' => '1.0.0', 'version' => '1.0.0',
'modes' => array( 'modes' => array(
'profile_info' => array('title' => 'UCP_PROFILE_PROFILE_INFO', 'auth' => '', 'cat' => array('UCP_PROFILE')), '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')), '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')), 'reg_details' => array('title' => 'UCP_PROFILE_REG_DETAILS', 'auth' => '', 'cat' => array('UCP_PROFILE')),
), ),

12
phpBB/install/database_update.php
View file

@ -1005,6 +1005,8 @@ function database_update_info()
), ),
// No changes from 3.0.11-RC2 to 3.0.11 // No changes from 3.0.11-RC2 to 3.0.11
'3.0.11-RC2' => array(), '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 */ /** @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 // No changes from 3.0.11-RC2 to 3.0.11
case '3.0.11-RC2': case '3.0.11-RC2':
break; 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;
} }
} }

6
phpBB/ucp.php
View file

@ -320,12 +320,6 @@ if (!$config['allow_topic_notify'] && !$config['allow_forum_notify'])
$module->set_display('main', 'subscribed', false); $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 // Select the active module
$module->set_active($id, $mode); $module->set_active($id, $mode);