From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 24 Mar 2016 11:34:32 +0000 (+0100)
Subject: Do display top-level content on remote shared notices
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7cd3de3494834abfefc405b958da9898780fcb40;p=mastodon.git

Do display top-level content on remote shared notices
---

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