diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-01 11:49:22 +0100 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-01 11:49:22 +0100 |
| commit | dd9432903ddb3e12381881da44fb84afff832d52 (patch) | |
| tree | b499e77cd4faf8157c2e048fb8242bc2ca2720cc /include/diaspora.php | |
| parent | e0c659b34b8992111bcc64d3f0eea75dfa193412 (diff) | |
| parent | bd2c8c92f1b30d8f811bd4aab0fe3a2c5496ec61 (diff) | |
| download | volse-hubzilla-dd9432903ddb3e12381881da44fb84afff832d52.tar.gz volse-hubzilla-dd9432903ddb3e12381881da44fb84afff832d52.tar.bz2 volse-hubzilla-dd9432903ddb3e12381881da44fb84afff832d52.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 5896f1bfd..dca857a19 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -794,15 +794,15 @@ function diaspora_reshare($importer,$xml) { 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"; - $body = scale_diaspora_images($body,false); + $body = scale_external_images($body,false); } elseif($source_xml->post->asphoto->image_url) { $body = '[img]' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '[/img]' . "\n"; - $body = scale_diaspora_images($body); + $body = scale_external_images($body); } elseif($source_xml->post->status_message) { $body = diaspora2bb($source_xml->post->status_message->raw_message); - $body = scale_diaspora_images($body); + $body = scale_external_images($body); } else { @@ -945,11 +945,11 @@ function diaspora_asphoto($importer,$xml) { if(strlen($xml->objectId) && ($xml->objectId != 0) && ($xml->image_url)) { $body = '[url=' . notags(unxmlify($xml->image_url)) . '][img]' . notags(unxmlify($xml->objectId)) . '[/img][/url]' . "\n"; - $body = scale_diaspora_images($body,false); + $body = scale_external_images($body,false); } elseif($xml->image_url) { $body = '[img]' . notags(unxmlify($xml->image_url)) . '[/img]' . "\n"; - $body = scale_diaspora_images($body); + $body = scale_external_images($body); } else { logger('diaspora_asphoto: no photo url found.'); @@ -1476,7 +1476,7 @@ function diaspora_photo($importer,$xml,$msg) { $link_text = '[img]' . $remote_photo_path . $remote_photo_name . '[/img]' . "\n"; - $link_text = scale_diaspora_images($link_text); + $link_text = scale_external_images($link_text); if(strpos($parent_item['body'],$link_text) === false) { $r = q("update item set `body` = '%s', `visible` = 1 where `id` = %d and `uid` = %d limit 1", |