gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #16586 - Fixes #16585 - BLOB to JPG transformation broken

Browse Source 
Pull-request: #16586
Fixes: #16585

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2021-01-24 00:55:41 +01:00
commit a9f12a1391
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/classes/Controllers/TransformationWrapperController.php
View File

@ -24,6 +24,7 @@ use function imagesx;
use function imagesy;
use function in_array;
use function intval;
use function round;
use function str_replace;
use function stripos;
use function substr;
@ -167,10 +168,10 @@ class TransformationWrapperController extends AbstractController
. ($mime_options['charset'] ?? '');
}
Core::downloadHeader($cn, $mime_type);
Core::downloadHeader($cn ?? '', $mime_type ?? '');
if (! isset($_REQUEST['resize'])) {
if (stripos($mime_type, 'html') === false) {
if (stripos($mime_type ?? '', 'html') === false) {
echo $row[$transform_key];
} else {
echo htmlspecialchars($row[$transform_key]);
@ -194,11 +195,11 @@ class TransformationWrapperController extends AbstractController
$ratioHeight = $srcHeight / $_REQUEST['newHeight'];
if ($ratioWidth < $ratioHeight) {
$destWidth = $srcWidth / $ratioHeight;
$destHeight = $_REQUEST['newHeight'];
$destWidth = intval(round($srcWidth / $ratioHeight));
$destHeight = intval($_REQUEST['newHeight']);
} else {
$destWidth = $_REQUEST['newWidth'];
$destHeight = $srcHeight / $ratioWidth;
$destWidth = intval($_REQUEST['newWidth']);
$destHeight = intval(round($srcHeight / $ratioWidth));
}
if ($_REQUEST['resize']) {