logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 4e41cd9ab8f51120d558b70528b163c98993be53
parent: 10459241a89b1ebf57986ee3bb81361475d19212
Author: Eugen <eugen@zeonfederated.com>
Date:   Fri,  7 Apr 2017 13:08:51 +0200

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

Fix nil#object_type error

Diffstat:

Mapp/lib/atom_serializer.rb2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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