about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-08 20:43:51 +0100
committerGitHub <noreply@github.com>2019-03-08 20:43:51 +0100
commit42cc93e8923a1b6cdb61574e9a86e360cba56abb (patch)
treeb01c0a68ef1518b27c51aa382bc89a5ade3b93f8 /app
parent93daa97fc33b663aacaf6656af25d25e0ba4499b (diff)
parent674fe32f972614c1617e61bf946e58006d18d019 (diff)
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app')
-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: '' }