about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-08 20:15:57 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-08 20:15:57 +0100
commit674fe32f972614c1617e61bf946e58006d18d019 (patch)
tree62e4a703d86ffa2203a7961a3d76d36970226e05 /app/models
parent29a09858f6700c0a6eb17797836589ed0839dec9 (diff)
parent3f4a6d44fe8366dc4d71501dc2d799d641af4687 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models')
-rw-r--r--app/models/account.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb
index bf2a17a7f..79eecc306 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -268,6 +268,7 @@ class Account < ApplicationRecord
     return if fields.size >= MAX_FIELDS
 
     tmp = self[:fields] || []
+    tmp = [] if tmp.is_a?(Hash)
 
     (MAX_FIELDS - tmp.size).times do
       tmp << { name: '', value: '' }