diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-15 17:29:38 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-15 17:29:38 -0700 |
| commit | 80eb84e843cdca51bbf4ebda180f4de41351b9c4 (patch) | |
| tree | d6cd7012210477c6e17322b2d19b8a1aad61ca44 /include/diaspora.php | |
| parent | e4880d07d2aa447425d0b7dc3656e84de08006c0 (diff) | |
| parent | 1eb478ba54206cca53653e7a579aa1a36fb03315 (diff) | |
| download | volse-hubzilla-80eb84e843cdca51bbf4ebda180f4de41351b9c4.tar.gz volse-hubzilla-80eb84e843cdca51bbf4ebda180f4de41351b9c4.tar.bz2 volse-hubzilla-80eb84e843cdca51bbf4ebda180f4de41351b9c4.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index b35318eac..c6d4b7423 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -927,9 +927,14 @@ function get_diaspora_reshare_xml($url,$recurse = 0) { // see if it's a reshare of a reshare - if($source_xml->root_diaspora_id && $source_xml->root_guid && $recurse < 15) { - $orig_author = notags(unxmlify($source_xml->root_diaspora_id)); - $orig_guid = notags(unxmlify($source_xml->root_guid)); + if($source_xml->post->reshare) + $xml = $source_xml->post->reshare; + else + return false; + + if($xml->root_diaspora_id && $xml->root_guid && $recurse < 15) { + $orig_author = notags(unxmlify($xml->root_diaspora_id)); + $orig_guid = notags(unxmlify($xml->root_guid)); $source_url = 'https://' . substr($orig_author,strpos($orig_author,'@')+1) . '/p/' . $orig_guid . '.xml'; $y = get_diaspora_reshare_xml($source_url,$recurse+1); if($y) |