From 33af8b0e202f720d94650bf63738895a473d7a0c Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 20 Oct 2011 01:16:03 -0700 Subject: [PATCH] diaspora_reshare - another try --- include/diaspora.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 99ef5025d6..24f4aac65a 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -627,12 +627,12 @@ function diaspora_reshare($importer,$xml) { $x = str_replace(array('',''),array('',''),$x); $source_xml = parse_xml_string($x,false); - if(strlen($source_xml->asphoto->objectId) && ($source_xml->asphoto->objectId != 0) && ($source_xml->asphoto->image_url)) - $body = '[url=' . notags(unxmlify($source_xml->asphoto->image_url)) . '][img]' . notags(unxmlify($source_xml->asphoto->objectId)) . '[/img][/url]' . "\n"; - elseif($source_xml->asphoto->image_url) - $body = '[img]' . notags(unxmlify($source_xml->asphoto->image_url)) . '[/img]' . "\n"; - elseif($source_xml->status_message) { - $body = diaspora2bb($source_xml->status_message->raw_message); + if(strlen($source_xml->post->asphoto->objectId) && ($source_xml->post->asphoto->objectId != 0) && ($source_xml->post->asphoto->image_url)) + $body = '[url=' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '][img]' . notags(unxmlify($source_xml->post->asphoto->objectId)) . '[/img][/url]' . "\n"; + elseif($source_xml->post->asphoto->image_url) + $body = '[img]' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '[/img]' . "\n"; + elseif($source_xml->post->status_message) { + $body = diaspora2bb($source_xml->post->status_message->raw_message); } else { logger('diaspora_reshare: no reshare content found: ' . print_r($source_xml,true));