diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-04-03 19:17:20 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-04-03 19:17:20 +0000 |
| commit | 6611100480c86c07972c1223e7231c136966e11d (patch) | |
| tree | d6ce7cf9568d13ba0dfc8ee32fd1335e0d053f43 /app/services | |
| parent | 1f5bdd8445f6ba192618288504b74c1df7c09ea6 (diff) | |
| parent | d8d42179590db772cc5b1873385cba7e5afe20df (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/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 |