Merge branch 'master' into glitch-soc/merge-upstream

2019-03-08 20:15:57 +01:00
parent 29a09858f6 3f4a6d44fe
commit 674fe32f97
5 changed files with 27 additions and 16 deletions
--- 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: '' }