diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-24 12:40:55 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-24 12:43:55 +0100 |
| commit | c8999a116ef71bef2cb28a783e4ba3d8e3cea6fa (patch) | |
| tree | 5de675d578d4e3b10ccbbcee12858f1c8a7c0eb0 /app/helpers/atom_builder_helper.rb | |
| parent | 7cd3de3494834abfefc405b958da9898780fcb40 (diff) | |
Sanitize remote html in atom feeds, API (not just UI), use cached mention
relations on Status#mentions
Diffstat (limited to 'app/helpers/atom_builder_helper.rb')
| -rw-r--r-- | app/helpers/atom_builder_helper.rb | 8 |
1 files changed, 1 insertions, 7 deletions
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 |