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

Fix nil#object_type error
7 years ago · 4e41cd9ab8
parent 10459241a8 c9b23a93c7
commit 4e41cd9ab8
1 changed files with 1 additions and 1 deletions
--- 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