about summary refs log tree commit diff
path: root/app/lib/atom_serializer.rb
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 22:08:54 -0400
committerGitHub <noreply@github.com>2017-04-07 22:08:54 -0400
commit05be34a94b79eaae7d1c4a66eb943b388940636d (patch)
tree944d1431693e13a4a68ae5584269211b2215e17c /app/lib/atom_serializer.rb
parent41396de7a90f23dd0afe1afa3dab1be43b7b6ecd (diff)
parentcb58694a81093230d1069040177de7f688c56d0d (diff)
Merge branch 'master' into master
Diffstat (limited to 'app/lib/atom_serializer.rb')
-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 be1cced8b..b9dcee6b3 100644
--- a/app/lib/atom_serializer.rb
+++ b/app/lib/atom_serializer.rb
@@ -328,7 +328,7 @@ class AtomSerializer
 
   def serialize_status_attributes(entry, status)
     append_element(entry, 'summary', status.spoiler_text) unless status.spoiler_text.blank?
-    append_element(entry, 'content', Formatter.instance.format(status.reblog? ? status.reblog : status).to_str, type: 'html')
+    append_element(entry, 'content', Formatter.instance.format(status.proper).to_str, type: 'html')
 
     status.mentions.each do |mentioned|
       append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': TagManager::TYPES[:person], href: TagManager.instance.uri_for(mentioned.account))