Fix suspended account's fields being set as empty dict instead of list (

#10178) Fixes #10177
mastodon · Mar 5, 2019 · d785497 · d785497
1 parent ac99b34
commit d785497
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/models/account.rb b/app/models/account.rb
@@ -241,6 +241,7 @@ def fields
   def fields_attributes=(attributes)
     fields     = []
     old_fields = self[:fields] || []
+    old_fields = [] if old_fields.is_a?(Hash)
 
     if attributes.is_a?(Hash)
       attributes.each_value do |attr|

diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
@@ -84,7 +84,7 @@ def purge_profile!
     @account.locked           = false
     @account.display_name     = ''
     @account.note             = ''
-    @account.fields           = {}
+    @account.fields           = []
     @account.statuses_count   = 0
     @account.followers_count  = 0
     @account.following_count  = 0