about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-07 13:08:51 +0200
committerGitHub <noreply@github.com>2017-04-07 13:08:51 +0200
commit4e41cd9ab8f51120d558b70528b163c98993be53 (patch)
treedb3843c56c0f124162fd04c2196faedd5a453590
parent10459241a89b1ebf57986ee3bb81361475d19212 (diff)
parentc9b23a93c7576aae2dfc5d526345599142393ca8 (diff)
Merge pull request #1146 from tootsuite/fix-object-type-nil-exception
Fix nil#object_type error
-rw-r--r--app/lib/atom_serializer.rb2
1 files changed, 1 insertions, 1 deletions
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