aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2009-06-19 22:03:19 +0000
committerJoas Schilling <nickvergessen@gmx.de>2009-06-19 22:03:19 +0000
commitd85a5ad036b2088fe742de29d9464678d2e19e23 (patch)
tree9bbd990b2baea05723f64cbcc26ecd39669bf464 /phpBB/install/database_update.php
parent6e884de00060c3632e1e7fa25c84c4e602fd46e8 (diff)
downloadforums-d85a5ad036b2088fe742de29d9464678d2e19e23.tar
forums-d85a5ad036b2088fe742de29d9464678d2e19e23.tar.gz
forums-d85a5ad036b2088fe742de29d9464678d2e19e23.tar.bz2
forums-d85a5ad036b2088fe742de29d9464678d2e19e23.tar.xz
forums-d85a5ad036b2088fe742de29d9464678d2e19e23.zip
Fix bug #46785 - Hide avatars if type disabled and give global option to turn on/off
Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9632 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 150ef20ca1..3848657809 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1115,6 +1115,15 @@ function change_database_data(&$no_updates, $version)
$_module->remove_cache_file();
+ if ($config['allow_avatar_upload'] || $config['allow_avatar_local'] || $config['allow_avatar_remote'])
+ {
+ set_config('allow_avatar', '1');
+ }
+ else
+ {
+ set_config('allow_avatar', '0');
+ }
+
$no_updates = false;
break;
}