diff options
| author | Mario <mario@mariovavti.com> | 2022-06-01 07:00:21 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-06-01 07:00:21 +0000 |
| commit | e63f0438415bb364f3085286ca2f199e83ab187b (patch) | |
| tree | b107429276ebfc92dc9b4f78e302a4967e5bf0a6 /include/photos.php | |
| parent | c5f33baf27d80e2a7ad7307eacd3137609eeb089 (diff) | |
| parent | 33dd0c83e377b8adf00559337d13784ec136cecb (diff) | |
| download | volse-hubzilla-7.4.tar.gz volse-hubzilla-7.4.tar.bz2 volse-hubzilla-7.4.zip | |
Merge branch '7.4RC'7.4
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/photos.php b/include/photos.php index 5bceb516d..9e4e8923d 100644 --- a/include/photos.php +++ b/include/photos.php @@ -359,13 +359,13 @@ function photo_upload($channel, $observer, $args) { $scale = 1; $width = $url[1]['width']; $height = $url[1]['height']; - $tag = (($r1) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]'); + $tag = (($r1) ? '[zmg=' . $url[1]['href'] . ']' : '[zmg]'); } else { $scale = 2; $width = $url[2]['width']; $height = $url[2]['height']; - $tag = (($r2) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]'); + $tag = (($r2) ? '[zmg=' .$url[2]['href'] . ']' : '[zmg]'); } $author_link = '[zrl=' . z_root() . '/channel/' . $channel['channel_address'] . ']' . $channel['channel_name'] . '[/zrl]'; @@ -379,7 +379,7 @@ function photo_upload($channel, $observer, $args) { $summary = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]'; $obj_body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' - . $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]' + . $tag . $filename . '[/zmg]' . '[/zrl]'; $url[] = [ |