zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Do display top-level content on remote shared notices

This commit is contained in:
Eugen Rochko 2016-03-24 12:34:32 +01:00
parent 082e1cbe5a
commit 7cd3de3494
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/atom_builder_helper.rb
View File

@ -139,7 +139,7 @@ module AtomBuilderHelper
if activity.is_a?(Status) if activity.is_a?(Status)
if activity.reblog? && activity.reblog.local? if activity.reblog? && activity.reblog.local?
linkify(activity.reblog) linkify(activity.reblog)
elsif activity.local? elsif !activity.reblog? && activity.local?
linkify(activity) linkify(activity)
else else
activity.content activity.content

2
app/models/status.rb
View File

@ -75,7 +75,7 @@ class Status < ActiveRecord::Base
end end
end end
m m.uniq
end end
def ancestors def ancestors