TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix regression in relation with recent photo changes

Browse Source
This commit is contained in:
Mario
2021-06-27 15:20:06 +00:00
parent d3d4dee36a
commit 3f6b6dfaf3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/attach.php
View File

@@ -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

10
include/photos.php
View File

@@ -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]');
}