about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2017-05-12 22:03:43 -0400
committerEugen Rochko <eugen@zeonfederated.com>2017-05-13 04:03:43 +0200
commit3dcb5fa28f13f597d49b5b442f61d12bc2be6152 (patch)
tree50d9b18404756964d7c368e6d79562be478a61f4 /app/lib
parent1d5dcfcd46b973791c4f19f1dd66f33f3498800a (diff)
Revert HTML CW changes (#3020)
* selectively Revert "Fix regressions from #2683 (#2970)"

This reverts commit 72698bc3b49925a2b2955f32e5a562c1eecd729b.

* Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)"

This reverts commit e2491680e696d2c285a798ec4c66b26d2748df66.
Diffstat (limited to 'app/lib')
-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 3113feac9..561bf7b59 100644
--- a/app/lib/atom_serializer.rb
+++ b/app/lib/atom_serializer.rb
@@ -343,7 +343,7 @@ class AtomSerializer
   end
 
   def serialize_status_attributes(entry, status)
-    append_element(entry, 'summary', Formatter.instance.format(status.proper, :spoiler_text, false).to_str, 'xml:lang': status.language, type: 'html') if status.spoiler_text?
+    append_element(entry, 'summary', status.spoiler_text, 'xml:lang': status.language) if status.spoiler_text?
     append_element(entry, 'content', Formatter.instance.format(status).to_str, type: 'html', 'xml:lang': status.language)
 
     status.mentions.each do |mentioned|