From: Eugen <eugen@zeonfederated.com>
Date: Sat, 14 Jan 2017 01:22:16 +0000 (+0100)
Subject: Fix too late return
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f63f0c46253f8d3c5524645160cbfe0c70cdec2f;p=mastodon.git

Fix too late return
---

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index f085fcd8e..cc35e65b8 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -44,6 +44,8 @@ class ProcessFeedService < BaseService
       Rails.logger.debug "Creating remote status #{id}"
       status = status_from_xml(@xml)
 
+      return if status.nil?
+      
       if verb == :share
         original_status = status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS))
         status.reblog   = original_status
@@ -56,8 +58,6 @@ class ProcessFeedService < BaseService
         end
       end
 
-      return if status.nil?
-
       status.save!
 
       NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local?