diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-07-14 20:25:41 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-07-14 20:25:41 +0000 |
| commit | 0b2979c6bab97297f839937606635fd4cc6b1eae (patch) | |
| tree | 592bd29d82cda1d1607b0a12ad6f598c32b1213b /phpBB/install | |
| parent | 753b8bb0bb6f6c8398189be451cc5095759c1e3e (diff) | |
| download | forums-0b2979c6bab97297f839937606635fd4cc6b1eae.tar forums-0b2979c6bab97297f839937606635fd4cc6b1eae.tar.gz forums-0b2979c6bab97297f839937606635fd4cc6b1eae.tar.bz2 forums-0b2979c6bab97297f839937606635fd4cc6b1eae.tar.xz forums-0b2979c6bab97297f839937606635fd4cc6b1eae.zip | |
Feature Bug #45375 - Add option to disable remote upload avatars
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9757 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 12 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 249b0a8f69..31d7976033 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1276,6 +1276,18 @@ function change_database_data(&$no_updates, $version) } } + if (!isset($config['allow_avatar_remote_upload'])) + { + if ($config['allow_avatar_remote'] && $config['allow_avatar_upload']) + { + set_config('allow_avatar_remote_upload', '1'); + } + else + { + set_config('allow_avatar_remote_upload', '0'); + } + } + // Minimum number of characters if (!isset($config['min_post_chars'])) { diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 86432a3084..0c5b527c9d 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -12,6 +12,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar', '0' INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote_upload', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_birthdays', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bookmarks', '1'); |