diff options
author | Reverite <github@reverite.sh> | 2019-04-01 13:28:33 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-04-01 13:28:33 -0700 |
commit | ff736905fa534f7189e57c1d0c14fbac45f239a1 (patch) | |
tree | 4502f6d993ba60bd4ab68f41a53a642901d244fd /app/models/form | |
parent | 4d77314005483e53e320a82c87805c6bcca1c463 (diff) | |
parent | 3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/form')
-rw-r--r-- | app/models/form/admin_settings.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 0fcbd0605..5b71dfad5 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -28,6 +28,9 @@ class Form::AdminSettings profile_directory hide_followers_count flavour_and_skin + thumbnail + hero + mascot ).freeze BOOLEAN_KEYS = %i( @@ -73,7 +76,7 @@ class Form::AdminSettings next if PSEUDO_KEYS.include?(key) value = instance_variable_get("@#{key}") - if UPLOAD_KEYS.include?(key) + if UPLOAD_KEYS.include?(key) && !value.nil? upload = SiteUpload.where(var: key).first_or_initialize(var: key) upload.update(file: value) else |