From fec6d65d96e4e76e987f080f402ca30aa8369736 Mon Sep 17 00:00:00 2001 From: Florian Schirmer Date: Thu, 21 Jan 2021 14:28:25 +0100 Subject: [PATCH 1/6] Fix BLOB JPG preview thumbnail Signed-off-by: Florian Schirmer --- .../Controllers/TransformationWrapperController.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/classes/Controllers/TransformationWrapperController.php b/libraries/classes/Controllers/TransformationWrapperController.php index e2c5e11e23..e12c811106 100644 --- a/libraries/classes/Controllers/TransformationWrapperController.php +++ b/libraries/classes/Controllers/TransformationWrapperController.php @@ -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; @@ -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']) { From ed36df4116b4c51190f29c6512ba9e5c230208b0 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Fri, 22 Jan 2021 23:49:02 +0100 Subject: [PATCH 2/6] Fix "Uncaught TypeError: Argument 1 passed to PhpMyAdmin\Core::downloadHeader()" Fatal error: Uncaught TypeError: Argument 1 passed to PhpMyAdmin\Core::downloadHeader() must be of the type string, null given, called in libraries/classes/Controllers/TransformationWrapperController.php on line 171 and defined in libraries/classes/Core.php:617 Stack trace: #0 libraries/classes/Controllers/TransformationWrapperController.php(171): PhpMyAdmin\Core::downloadHeader(NULL, 'application/oct...') #1 libraries/classes/Routing.php(92): PhpMyAdmin\Controllers\TransformationWrapperController->index(Array) #2 index.php(18): PhpMyAdmin\Routing::callControllerForRoute('/transformation...', Object(FastRoute\Dispatcher\GroupCountBased), Object(Symfony\Component\DependencyInjection\ContainerBuilder)) #3 {main} thrown in libraries/classes/Core.php on line 617 Signed-off-by: William Desportes --- .../classes/Controllers/TransformationWrapperController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/classes/Controllers/TransformationWrapperController.php b/libraries/classes/Controllers/TransformationWrapperController.php index e12c811106..acf92db0c1 100644 --- a/libraries/classes/Controllers/TransformationWrapperController.php +++ b/libraries/classes/Controllers/TransformationWrapperController.php @@ -168,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]); From 223bceff904aac788a581bb86d6e7d188041bea6 Mon Sep 17 00:00:00 2001 From: Rajat Jain Date: Mon, 21 Sep 2020 14:00:53 +0530 Subject: [PATCH 3/6] Textarea font-size changed to initial Signed-off-by: Rajat Jain --- themes/metro/scss/_reboot.scss | 4 ++-- themes/original/scss/_reboot.scss | 4 ++-- themes/pmahomme/scss/_reboot.scss | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/themes/metro/scss/_reboot.scss b/themes/metro/scss/_reboot.scss index 8144360a1a..26bf49a980 100644 --- a/themes/metro/scss/_reboot.scss +++ b/themes/metro/scss/_reboot.scss @@ -13,11 +13,11 @@ body { // Forms input, -select, -textarea { +select { font-size: 1em; } textarea { font-family: $font-family-monospace; + font-size: 1.2em; } diff --git a/themes/original/scss/_reboot.scss b/themes/original/scss/_reboot.scss index 0b85978ccb..3aab810f46 100644 --- a/themes/original/scss/_reboot.scss +++ b/themes/original/scss/_reboot.scss @@ -7,11 +7,11 @@ body { // Forms input, -select, -textarea { +select { font-size: 1em; } textarea { font-family: $font-family-monospace; + font-size: 1.2em; } diff --git a/themes/pmahomme/scss/_reboot.scss b/themes/pmahomme/scss/_reboot.scss index 0b85978ccb..3aab810f46 100644 --- a/themes/pmahomme/scss/_reboot.scss +++ b/themes/pmahomme/scss/_reboot.scss @@ -7,11 +7,11 @@ body { // Forms input, -select, -textarea { +select { font-size: 1em; } textarea { font-family: $font-family-monospace; + font-size: 1.2em; } From eae9366d20508402d60fcb8c56418f84740df549 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 24 Jan 2021 00:50:59 +0100 Subject: [PATCH 4/6] Upgrade node-notifier to 8.0.1 Fixes CVE-2020-7789 Signed-off-by: William Desportes --- yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 92a1a3060c..47c81b2021 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1256,7 +1256,7 @@ terminal-link "^2.0.0" v8-to-istanbul "^7.0.0" optionalDependencies: - node-notifier "^8.0.0" + node-notifier "^8.0.1" "@jest/source-map@^26.6.2": version "26.6.2" @@ -4574,10 +4574,10 @@ node-modules-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-notifier@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620" - integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA== +node-notifier@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" + integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== dependencies: growly "^1.3.0" is-wsl "^2.2.0" From b24bb6e5bd4b7204cfcda122b9979262de041efc Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 24 Jan 2021 00:54:27 +0100 Subject: [PATCH 5/6] Add a ChangeLog entry for #16252 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 87a8a45a88..f4d0450768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ phpMyAdmin - ChangeLog - issue #16464 Made the relation view default to the current database when creating relations - issue #16463 Fixed 'REFERENCES' privilege checkbox's title on new MySQL versions and on MariaDB - issue #16405 Added jest as a Unit Testing tool for our javascript code +- issue #16252 Fixed the too small font size when editing rows (textareas) 5.0.5 (not yet released) - issue #14494 Fix uncaught TypeError when editing partitioning From 548cb7136e217174f6cc6d7bfc65b2e1be846bd0 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 24 Jan 2021 00:58:15 +0100 Subject: [PATCH 6/6] Add a ChangeLog entry for #16585 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index f4d0450768..ed40506d3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ phpMyAdmin - ChangeLog - issue #16463 Fixed 'REFERENCES' privilege checkbox's title on new MySQL versions and on MariaDB - issue #16405 Added jest as a Unit Testing tool for our javascript code - issue #16252 Fixed the too small font size when editing rows (textareas) +- issue #16585 Fixed BLOB to JPG transformation PHP errors 5.0.5 (not yet released) - issue #14494 Fix uncaught TypeError when editing partitioning