diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-24 12:34:32 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-24 12:34:32 +0100 |
| commit | 7cd3de3494834abfefc405b958da9898780fcb40 (patch) | |
| tree | 32b1498ae6e686db0f7458801661f8f425b7d98a /app | |
| parent | 082e1cbe5a6bcff291e0fe96260ca8920776a18e (diff) | |
Do display top-level content on remote shared notices
Diffstat (limited to 'app')
| -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 |