From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2017 11:05:34 +0000 (+0200)
Subject: Fix nil#object_type error
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8a6d8de60ac573f5b97bfe52f91f5a9e8e09fadf;p=mastodon.git

Fix nil#object_type error
---

diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb
index 4ce0f4513..be1cced8b 100644
--- a/app/lib/atom_serializer.rb
+++ b/app/lib/atom_serializer.rb
@@ -101,7 +101,7 @@ class AtomSerializer
     serialize_status_attributes(object, status)
 
     append_element(object, 'link', nil, rel: :alternate, type: 'text/html', href: TagManager.instance.url_for(status))
-    append_element(object, 'thr:in-reply-to', nil, ref: TagManager.instance.uri_for(status.thread), href: TagManager.instance.url_for(status.thread)) if status.reply?
+    append_element(object, 'thr:in-reply-to', nil, ref: TagManager.instance.uri_for(status.thread), href: TagManager.instance.url_for(status.thread)) if status.reply? && !status.thread.nil?
 
     object
   end