Merge pull request #1146 from tootsuite/fix-object-type-nil-exception

Fix nil#object_type error
mastodon · Apr 7, 2017 · 4e41cd9 · 4e41cd9
2 parents 1045924 + c9b23a9
commit 4e41cd9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb
@@ -101,7 +101,7 @@ def object(status)
     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