aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-14 18:47:08 -0700
committerfriendica <info@friendica.com>2014-10-14 18:47:08 -0700
commit65b84e839a2acfad2f86c1ed40c9fdc67e4fc8ed (patch)
treeee8449755cf0b285ecb2f7339ba3285ba0b121ab
parent5362943330a0a57a45dd2ed0a4464b1208480aee (diff)
downloadvolse-hubzilla-65b84e839a2acfad2f86c1ed40c9fdc67e4fc8ed.tar.gz
volse-hubzilla-65b84e839a2acfad2f86c1ed40c9fdc67e4fc8ed.tar.bz2
volse-hubzilla-65b84e839a2acfad2f86c1ed40c9fdc67e4fc8ed.zip
back to wrestling with the !@#$ diaspora recursive reshare from hell
-rwxr-xr-xinclude/diaspora.php11
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)