diff options
| author | Friendika <info@friendika.com> | 2011-10-20 01:16:03 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-10-20 01:16:03 -0700 |
| commit | 33af8b0e202f720d94650bf63738895a473d7a0c (patch) | |
| tree | 99afecf575aef5d13c446c0ad33fbc341ef515d5 /include/diaspora.php | |
| parent | df996a8b5ed2ac33c26a522d65eca6d6a4abe439 (diff) | |
| download | volse-hubzilla-33af8b0e202f720d94650bf63738895a473d7a0c.tar.gz volse-hubzilla-33af8b0e202f720d94650bf63738895a473d7a0c.tar.bz2 volse-hubzilla-33af8b0e202f720d94650bf63738895a473d7a0c.zip | |
diaspora_reshare - another try
Diffstat (limited to 'include/diaspora.php')
| -rw-r--r-- | include/diaspora.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 99ef5025d..24f4aac65 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -627,12 +627,12 @@ function diaspora_reshare($importer,$xml) { $x = str_replace(array('<activity_streams-photo>','</activity_streams-photo>'),array('<asphoto>','</asphoto>'),$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)); |