Merge pull request #4973 from annando/diaspora-link
Bugfix: Twitter "Reshares" are now appearing again on Diaspora
This commit is contained in:
commit
fbe1206f35
|
@ -3571,8 +3571,12 @@ class Diaspora
|
||||||
$ret["root_guid"] = $guid;
|
$ret["root_guid"] = $guid;
|
||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
} elseif (($guid == "") && $complete) {
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$ret["root_guid"] = $guid;
|
||||||
|
|
||||||
$profile = "";
|
$profile = "";
|
||||||
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
|
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
|
||||||
if ($matches[1] != "") {
|
if ($matches[1] != "") {
|
||||||
|
@ -3593,10 +3597,6 @@ class Diaspora
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($guid)) {
|
|
||||||
$ret["root_guid"] = $guid;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (empty($ret) && !$complete) {
|
if (empty($ret) && !$complete) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user