aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-10-23 14:08:38 +0200
committerNils Adermann <naderman@naderman.de>2010-10-23 14:08:38 +0200
commite87a8ef02c029a7c622b5ab8bb60e67c012a6165 (patch)
tree6dc6bcc96ce4c46038539d31c9a93ce382a6fde6 /phpBB/install
parentd503272645d0f14daa2c2664e04dbdc33da9379e (diff)
parentb9afa26280bcb2aa6d11f8b15faec4aad23dced8 (diff)
downloadforums-e87a8ef02c029a7c622b5ab8bb60e67c012a6165.tar
forums-e87a8ef02c029a7c622b5ab8bb60e67c012a6165.tar.gz
forums-e87a8ef02c029a7c622b5ab8bb60e67c012a6165.tar.bz2
forums-e87a8ef02c029a7c622b5ab8bb60e67c012a6165.tar.xz
forums-e87a8ef02c029a7c622b5ab8bb60e67c012a6165.zip
Merge branch 'ticket/igorw/9807' into develop-olympus
* ticket/igorw/9807: [ticket/9807] Update existing module permissions in database [ticket/9807] Hide avatar tab in UCP when avatars are disabled
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/database_update.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index ca4ef817be..e65237266b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1698,6 +1698,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 . "