aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-25 12:47:46 -0700
committerfriendica <info@friendica.com>2014-03-25 12:47:46 -0700
commitf14596b1ebeecf2c75939374136c830e44dbd923 (patch)
treecef612ce9d8e9ac7d0676e4c01be48aea5d9e4f4 /include
parentdc091800c3a138810b2c14127dfa2fe4fab3616b (diff)
parentfbb12ca86acf40bf61f2ad8f69aee78db8df8dcb (diff)
downloadvolse-hubzilla-f14596b1ebeecf2c75939374136c830e44dbd923.tar.gz
volse-hubzilla-f14596b1ebeecf2c75939374136c830e44dbd923.tar.bz2
volse-hubzilla-f14596b1ebeecf2c75939374136c830e44dbd923.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include')
-rw-r--r--include/photos.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/photos.php b/include/photos.php
index 65d2dfb30..65532e6c2 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -224,9 +224,13 @@ function photo_upload($channel, $observer, $args) {
$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
+ if ($width_x_height)
+ $tag = '[zmg=' . $width_x_height. ']';
+ else
+ $tag = '[zmg]';
$arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']'
- . '[zmg=' . $width_x_height. ']' . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]'
+ . $tag . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]'
. '[/zrl]';
$result = item_store($arr);