1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 17:27:16 +02:00

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
This commit is contained in:
Nils Adermann
2010-10-23 14:10:19 +02:00
2 changed files with 9 additions and 1 deletions

View File

@@ -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 . "