github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-17 01:59:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

phpBB3 importer: Fix validation of site settings

Browse Source
This commit is contained in:
Gerhard Schlager 2017-08-29 01:48:30 +02:00
parent df096f7803
commit e9fb2c5756
No known key found for this signature in database
GPG Key ID: 7DACA3C95B36014B
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
script/import_scripts/phpbb3/importer.rb
View File

@ -34,32 +34,9 @@ module ImportScripts::PhpBB3
end
def change_site_settings
# let's make sure that we import all attachments no matter how big they are
setting_keys = [:max_image_size_kb, :max_attachment_size_kb]
original_validators = disable_setting_validators(setting_keys)
super
@importers.permalink_importer.change_site_settings
enable_setting_validators(original_validators)
end
def disable_setting_validators(setting_keys)
original_validators = {}
setting_keys.each do |key|
original_validators[key] = SiteSetting.validators[key]
SiteSetting.validators[key] = nil
end
original_validators
end
def enable_setting_validators(original_validators)
original_validators.each do |key, validator|
SiteSetting.validators[key] = validator
end
end
def get_site_settings_for_import
@ -69,6 +46,10 @@ module ImportScripts::PhpBB3
settings[:max_image_size_kb] = [max_file_size_kb, SiteSetting.max_image_size_kb].max
settings[:max_attachment_size_kb] = [max_file_size_kb, SiteSetting.max_attachment_size_kb].max
# temporarily disable validation since we want to import all existing images and attachments
SiteSetting.type_supervisor.load_setting(:max_image_size_kb, max: settings[:max_image_size_kb])
SiteSetting.type_supervisor.load_setting(:max_attachment_size_kb, max: settings[:max_attachment_size_kb])
settings
end