diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-10-23 14:10:19 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-10-23 14:10:19 +0200 |
| commit | ecd648c9967f360ea21d3f1a479704af803499fe (patch) | |
| tree | 70ec71e1734728aead0e7ec4cfa262f201a268ff | |
| parent | 6bba2794342553a81c2427d6db3e3dfc715c9550 (diff) | |
| parent | e87a8ef02c029a7c622b5ab8bb60e67c012a6165 (diff) | |
| download | forums-ecd648c9967f360ea21d3f1a479704af803499fe.tar forums-ecd648c9967f360ea21d3f1a479704af803499fe.tar.gz forums-ecd648c9967f360ea21d3f1a479704af803499fe.tar.bz2 forums-ecd648c9967f360ea21d3f1a479704af803499fe.tar.xz forums-ecd648c9967f360ea21d3f1a479704af803499fe.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9807] Update existing module permissions in database
[ticket/9807] Hide avatar tab in UCP when avatars are disabled
| -rw-r--r-- | phpBB/includes/ucp/info/ucp_profile.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/info/ucp_profile.php b/phpBB/includes/ucp/info/ucp_profile.php index 03a4c81f46..d19b80f4c0 100644 --- a/phpBB/includes/ucp/info/ucp_profile.php +++ b/phpBB/includes/ucp/info/ucp_profile.php @@ -22,7 +22,7 @@ class ucp_profile_info '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')), - 'avatar' => array('title' => 'UCP_PROFILE_AVATAR', 'auth' => '', '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 211e194c73..7d5fb544ed 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1707,6 +1707,14 @@ function change_database_data(&$no_updates, $version) _add_modules($modules_to_install); + // update + $sql = 'UPDATE ' . MODULES_TABLE . ' + SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\' + WHERE module_class = \'ucp\' + AND module_basename = \'profile\' + AND module_mode = \'avatar\''; + _sql($sql, $errored, $error_ary); + // add Bing Bot $sql = 'SELECT group_id, group_colour FROM ' . GROUPS_TABLE . " |