diff options
| author | friendica <info@friendica.com> | 2014-03-23 14:45:56 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-03-23 14:45:56 -0700 |
| commit | 6a014abe1c8f0475645ae8f514b473554847891b (patch) | |
| tree | 074ad11b763b93843141b7c7f58c2add7035accb /include | |
| parent | 7666aaea6a8613c11c685ca1863b772ceaaacc48 (diff) | |
| parent | ff0a07655da0201490fbb51bc9163da53b3d40a2 (diff) | |
| download | volse-hubzilla-6a014abe1c8f0475645ae8f514b473554847891b.tar.gz volse-hubzilla-6a014abe1c8f0475645ae8f514b473554847891b.tar.bz2 volse-hubzilla-6a014abe1c8f0475645ae8f514b473554847891b.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include')
| -rw-r--r-- | include/photos.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/photos.php b/include/photos.php index 82af4aaeb..c0243cc15 100644 --- a/include/photos.php +++ b/include/photos.php @@ -164,6 +164,7 @@ function photo_upload($channel, $observer, $args) { $p['scale'] = 1; $r2 = $ph->save($p); $smallest = 1; + $width_x_height = $ph->getWidth() . 'x' . $ph->getHeight(); if(! $r2) $errors = true; } @@ -173,6 +174,7 @@ function photo_upload($channel, $observer, $args) { $p['scale'] = 2; $r3 = $ph->save($p); $smallest = 2; + $width_x_height = $ph->getWidth() . 'x' . $ph->getHeight(); if(! $r3) $errors = true; } @@ -221,7 +223,7 @@ function photo_upload($channel, $observer, $args) { $arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' - . '[zmg]' . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]' + . '[zmg=' . $width_x_height. ']' . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]' . '[/zrl]'; $result = item_store($arr); @@ -426,4 +428,4 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) { $item_id = $result['item_id']; return $item_id; -}
\ No newline at end of file +} |