Merge pull request #3753 from annando/diaspora-reshare
Diaspora: Reshares of reshares sometimes had problems
This commit is contained in:
commit
1470e8e747
|
@ -2331,7 +2331,7 @@ class Diaspora {
|
||||||
// If it is a reshared post from another network then reformat to avoid display problems with two share elements
|
// 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)) {
|
if (self::is_reshare($r[0]["body"], true)) {
|
||||||
$r = array();
|
$r = array();
|
||||||
} elseif (self::is_reshare($r[0]["body"], false)) {
|
} elseif (self::is_reshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) {
|
||||||
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
|
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
|
||||||
|
|
||||||
$r[0]["body"] = self::replace_people_guid($r[0]["body"], $r[0]["author-link"]);
|
$r[0]["body"] = self::replace_people_guid($r[0]["body"], $r[0]["author-link"]);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user