From 0f71d0bd07b418dcc0d8537948206139955ce945 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 22 Mar 2016 23:00:42 +0100 Subject: [PATCH] Reshare of reshares now work. --- include/diaspora.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 632e3782c7..289f717708 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1853,10 +1853,14 @@ class diaspora { logger("reshared message ".$guid." already exists on system."); // Maybe it is already a reshared item? - // Then refetch the content, since there can be many side effects with reshared posts from other networks or reshares from reshares - if (self::is_reshare($r[0]["body"], false)) + // Then refetch the content, if it is a reshare from a reshare. + // If it is a reshared post from another network then reformat to avoid display problems with two share elements + if (self::is_reshare($r[0]["body"], true)) $r = array(); - else + elseif (self::is_reshare($r[0]["body"], false)) { + $r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"])); + return $r[0]; + } else return $r[0]; }