diff options
author | David Yip <yipdw@member.fsf.org> | 2018-04-04 13:55:42 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-04-04 13:55:42 -0500 |
commit | bda1782cd864ed3aabb5a4d87359a1cb7595f4a6 (patch) | |
tree | 4ecb8623959b616fec9ab2a9c855048fb8c2da49 /app/services | |
parent | 77b650b69c8146a2acf4e7d270343f89c9838690 (diff) | |
parent | 6611100480c86c07972c1223e7231c136966e11d (diff) |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/activitypub/process_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index cf8462821..21c2fc57a 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -28,7 +28,7 @@ class ActivityPub::ProcessAccountService < BaseService after_protocol_change! if protocol_changed? after_key_change! if key_changed? - check_featured_collection! if @account.featured_collection_url.present? + check_featured_collection! if @account&.featured_collection_url&.present? @account rescue Oj::ParseError |