Merge branch 'QA_5_1'

Signed-off-by: William Desportes <williamdes@wdes.fr>

ChangeLog

@@ -81,6 +81,8 @@ 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)
+- issue #16585 Fixed BLOB to JPG transformation PHP errors
 
 5.0.5 (not yet released)
 - issue #14494 Fix uncaught TypeError when editing partitioning

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

themes/metro/scss/_reboot.scss

@@ -37,11 +37,11 @@ h3 {
 // Forms
 
 input,
-select,
-textarea {
+select {
   font-size: 1em;
 }
 
 textarea {
   font-family: $font-family-monospace;
+  font-size: 1.2em;
 }

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;
 }

themes/pmahomme/scss/_reboot.scss

@@ -24,11 +24,11 @@ h3 {
 // Forms
 
 input,
-select,
-textarea {
+select {
   font-size: 1em;
 }
 
 textarea {
   font-family: $font-family-monospace;
+  font-size: 1.2em;
 }

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"
@@ -4604,10 +4604,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"