From c8999a116ef71bef2cb28a783e4ba3d8e3cea6fa Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 24 Mar 2016 12:40:55 +0100
Subject: Sanitize remote html in atom feeds, API (not just UI), use cached
 mention relations on Status#mentions

---
 app/helpers/atom_builder_helper.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'app/helpers/atom_builder_helper.rb')

diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb
index 74c87daaa..51ab4da16 100644
--- a/app/helpers/atom_builder_helper.rb
+++ b/app/helpers/atom_builder_helper.rb
@@ -137,13 +137,7 @@ module AtomBuilderHelper
 
   def conditionally_formatted(activity)
     if activity.is_a?(Status)
-      if activity.reblog? && activity.reblog.local?
-        linkify(activity.reblog)
-      elsif !activity.reblog? && activity.local?
-        linkify(activity)
-      else
-        activity.content
-      end
+      content_for_status(activity.reblog? ? activity.reblog : activity)
     elsif activity.nil?
       nil
     else
-- 
cgit