djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-24 00:54:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #10177
This commit is contained in:
ThibG 2019-03-05 15:19:54 +01:00 committed by Eugen Rochko
parent ac99b3465e
commit d785497ba5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/account.rb
View File

@ -241,6 +241,7 @@ class Account < ApplicationRecord
def fields_attributes=(attributes) def fields_attributes=(attributes)
fields = [] fields = []
old_fields = self[:fields] || [] old_fields = self[:fields] || []
old_fields = [] if old_fields.is_a?(Hash)
if attributes.is_a?(Hash) if attributes.is_a?(Hash)
attributes.each_value do |attr| attributes.each_value do |attr|

2
app/services/suspend_account_service.rb
View File

@ -84,7 +84,7 @@ class SuspendAccountService < BaseService
@account.locked = false @account.locked = false
@account.display_name = '' @account.display_name = ''
@account.note = '' @account.note = ''
@account.fields = {} @account.fields = []
@account.statuses_count = 0 @account.statuses_count = 0
@account.followers_count = 0 @account.followers_count = 0
@account.following_count = 0 @account.following_count = 0