aboutsummaryrefslogtreecommitdiffstats
path: root/include/diaspora.php
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-06-23 10:37:59 -0700
committerSimon <simon@kisikew.org>2012-06-23 10:37:59 -0700
commit381d0912672cda6575368d242565310a93e202d4 (patch)
treebd8a9d029ddaebbd1d8385dfd522f689e5d3891c /include/diaspora.php
parentf6b7b99d16b3b8f10ccc2f5f1cdc756047846910 (diff)
parent90f8454190612db8582f14d55029aed381a22898 (diff)
downloadvolse-hubzilla-381d0912672cda6575368d242565310a93e202d4.tar.gz
volse-hubzilla-381d0912672cda6575368d242565310a93e202d4.tar.bz2
volse-hubzilla-381d0912672cda6575368d242565310a93e202d4.zip
Merge pull request #352 from fermionic/diaspora-display-scaled-down-image
allow linking to Diaspora's scaled-down images
Diffstat (limited to 'include/diaspora.php')
-rwxr-xr-xinclude/diaspora.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index 80fb10404..fdb85f15f 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1560,7 +1560,8 @@ function diaspora_photo($importer,$xml,$msg) {
$link_text = '[img]' . $remote_photo_path . $remote_photo_name . '[/img]' . "\n";
- $link_text = scale_external_images($link_text);
+ $link_text = scale_external_images($link_text, true,
+ array($remote_photo_name, 'scaled_full_' . $remote_photo_name));
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",