diff options
| author | Mario <mario@mariovavti.com> | 2021-06-27 15:20:06 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-06-27 15:20:06 +0000 |
| commit | 3f6b6dfaf3ea8fbb2845d3f3c40e00a0e6d3ce06 (patch) | |
| tree | 54a64c9d01da16db29c320606b799ff0f7df9f44 | |
| parent | d3d4dee36a200fc318370cba977025e109a84370 (diff) | |
| download | volse-hubzilla-3f6b6dfaf3ea8fbb2845d3f3c40e00a0e6d3ce06.tar.gz volse-hubzilla-3f6b6dfaf3ea8fbb2845d3f3c40e00a0e6d3ce06.tar.bz2 volse-hubzilla-3f6b6dfaf3ea8fbb2845d3f3c40e00a0e6d3ce06.zip | |
fix regression in relation with recent photo changes
| -rw-r--r-- | include/attach.php | 4 | ||||
| -rw-r--r-- | include/photos.php | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/attach.php b/include/attach.php index db7046ef0..09d4005e8 100644 --- a/include/attach.php +++ b/include/attach.php @@ -668,8 +668,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $def_extension = '.jpg'; if($gis[2] === IMAGETYPE_PNG) $def_extension = '.png'; - if($gis[2] === IMAGETYPE_WEBP) - $def_extension = '.webp'; + if($gis[2] === IMAGETYPE_WEBP) + $def_extension = '.webp'; } // If we know it's a photo, over-ride the type in case the source system could not determine what it was diff --git a/include/photos.php b/include/photos.php index a783875bb..cfa29a253 100644 --- a/include/photos.php +++ b/include/photos.php @@ -259,7 +259,7 @@ function photo_upload($channel, $observer, $args) { if($args['description']) $p['description'] = $args['description']; - $link = array(); + $url = []; $r0 = $ph->save($p); $url[0] = array( @@ -360,14 +360,14 @@ function photo_upload($channel, $observer, $args) { if($large_photos) { $scale = 1; - $width = $link[1]['width']; - $height = $link[1]['height']; + $width = $url[1]['width']; + $height = $url[1]['height']; $tag = (($r1) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]'); } else { $scale = 2; - $width = $link[2]['width']; - $height = $link[2]['height']; + $width = $url[2]['width']; + $height = $url[2]['height']; $tag = (($r2) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]'); } |