harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #374 from git-marijus/master

Browse Source 
add width and height to uploaded photo body
This commit is contained in:
friendica 2014-03-23 08:07:56 +11:00
commit f6af20576a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/photos.php
View File

@ -164,6 +164,7 @@ function photo_upload($channel, $observer, $args) {
$p['scale'] = 1; $p['scale'] = 1;
$r2 = $ph->save($p); $r2 = $ph->save($p);
$smallest = 1; $smallest = 1;
$width_x_height = $ph->getWidth() . 'x' . $ph->getHeight();
if(! $r2) if(! $r2)
$errors = true; $errors = true;
} }
@ -173,6 +174,7 @@ function photo_upload($channel, $observer, $args) {
$p['scale'] = 2; $p['scale'] = 2;
$r3 = $ph->save($p); $r3 = $ph->save($p);
$smallest = 2; $smallest = 2;
$width_x_height = $ph->getWidth() . 'x' . $ph->getHeight();
if(! $r3) if(! $r3)
$errors = true; $errors = true;
} }
@ -221,7 +223,7 @@ function photo_upload($channel, $observer, $args) {
$arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' $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]'; . '[/zrl]';
$result = item_store($arr); $result = item_store($arr);