diff options
| -rw-r--r-- | app/helpers/atom_builder_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb index d5180f0f5..74c87daaa 100644 --- a/app/helpers/atom_builder_helper.rb +++ b/app/helpers/atom_builder_helper.rb @@ -139,7 +139,7 @@ module AtomBuilderHelper if activity.is_a?(Status) if activity.reblog? && activity.reblog.local? linkify(activity.reblog) - elsif activity.local? + elsif !activity.reblog? && activity.local? linkify(activity) else activity.content diff --git a/app/models/status.rb b/app/models/status.rb index 68f4adf34..2462d6b7d 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -75,7 +75,7 @@ class Status < ActiveRecord::Base end end - m + m.uniq end def ancestors |