Merge branch 'QA_5_2'

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

11 files changed, 55 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a611c08f2..594d531bc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog
 - issue #16042 Exported gzip file of database has first ~73 kB uncompressed and rest is gzip compressed in Firefox
 - issue #17705 Fix inline SQL query edit FK checkbox preventing submit buttons from working
 - issue #17777 Fix Uncaught TypeError: Cannot read properties of null (reading 'inline') on datepickers when re-opened
+- issue        Fix Original theme buttons style and login form width
 
 5.2.0 (2022-05-10)
 - issue #16521 Upgrade Bootstrap to version 5
diff --git a/js/src/modules/console.js b/js/src/modules/console.js
index d1f47b6d50..9454cdc8f3 100644
--- a/js/src/modules/console.js
+++ b/js/src/modules/console.js
@@ -517,6 +517,7 @@ var ConsoleInput = {
         if (ConsoleInput.codeMirror) {
             // eslint-disable-next-line new-cap
             ConsoleInput.inputs.console = CodeMirror($('#pma_console').find('.console_query_input')[0], {
+                // style: cm-s-pma
                 theme: 'pma',
                 mode: 'text/x-sql',
                 lineWrapping: true,
@@ -535,6 +536,7 @@ var ConsoleInput = {
             if ($('#pma_bookmarks').length !== 0) {
                 // eslint-disable-next-line new-cap
                 ConsoleInput.inputs.bookmark = CodeMirror($('#pma_console').find('.bookmark_add_input')[0], {
+                    // style: cm-s-pma
                     theme: 'pma',
                     mode: 'text/x-sql',
                     lineWrapping: true,
diff --git a/libraries/classes/Controllers/Import/ImportController.php b/libraries/classes/Controllers/Import/ImportController.php
index bc6f65df12..2114c92599 100644
--- a/libraries/classes/Controllers/Import/ImportController.php
+++ b/libraries/classes/Controllers/Import/ImportController.php
@@ -140,10 +140,9 @@ final class ImportController extends AbstractController
             // apply values for parameters
             if (! empty($_POST['parameterized']) && ! empty($_POST['parameters']) && is_array($_POST['parameters'])) {
                 $parameters = $_POST['parameters'];
-                foreach ($parameters as $parameter => $replacement) {
-                    $replacementValue = $this->dbi->escapeString($replacement);
+                foreach ($parameters as $parameter => $replacementValue) {
                     if (! is_numeric($replacementValue)) {
-                        $replacementValue = '\'' . $replacementValue . '\'';
+                        $replacementValue = '\'' . $this->dbi->escapeString($replacementValue) . '\'';
                     }
 
                     $quoted = preg_quote($parameter, '/');
diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
index b9c0562cb9..ff179fdae8 100644
--- a/libraries/classes/Plugins/Export/ExportSql.php
+++ b/libraries/classes/Plugins/Export/ExportSql.php
@@ -2349,23 +2349,20 @@ class ExportSql extends ExportPlugin
                     }
                 } elseif ($metaInfo->isMappedTypeBit) {
                     // detection of 'bit' works only on mysqli extension
-                    $values[] = "b'" . $GLOBALS['dbi']->escapeString(
-                        Util::printableBitValue(
-                            (int) $row[$j],
-                            $metaInfo->length
-                        )
-                    )
-                    . "'";
+                    $values[] = "b'" . Util::printableBitValue(
+                        (int) $row[$j],
+                        $metaInfo->length
+                    ) . "'";
                 } elseif ($metaInfo->isMappedTypeGeometry) {
                     // export GIS types as hex
                     $values[] = '0x' . bin2hex($row[$j]);
                 } elseif (! empty($GLOBALS['exporting_metadata']) && $row[$j] === '@LAST_PAGE') {
                     $values[] = '@LAST_PAGE';
+                } elseif ($row[$j] === '') {
+                    $values[] = "''";
                 } else {
                     // something else -> treat as a string
-                    $values[] = '\''
-                        . $GLOBALS['dbi']->escapeString($row[$j])
-                        . '\'';
+                    $values[] = '\'' . $GLOBALS['dbi']->escapeString($row[$j]) . '\'';
                 }
             }
 
diff --git a/package.json b/package.json
index 7d9aa646c4..13cd51c4b4 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "autoprefixer": "^10.4.7",
     "babel-loader": "^8.2.3",
     "bootstrap": "5.2.0",
-    "codemirror": "5.65.3",
+    "codemirror": "5.65.9",
     "copy-webpack-plugin": "^10.2.4",
     "css-loader": "^6.6.0",
     "jquery": "3.6.0",
diff --git a/themes/bootstrap/scss/_codemirror.scss b/themes/bootstrap/scss/_codemirror.scss
index aca7b8b6f0..b5a25f3352 100644
--- a/themes/bootstrap/scss/_codemirror.scss
+++ b/themes/bootstrap/scss/_codemirror.scss
@@ -7,12 +7,14 @@ $textarea-rows: 15;
   border: $card-border-width solid $card-border-color;
 
   @include border-radius($card-border-radius);
+}
 
+// Code mirror default style (do not affect the console style)
+.CodeMirror.cm-s-default {
   // @see: issue #17705
   div.CodeMirror-scroll {
     margin-right: 0;
     padding-bottom: 0;
-    overflow: hidden !important;
   }
 }
 
diff --git a/themes/metro/scss/_codemirror.scss b/themes/metro/scss/_codemirror.scss
index bf2968629d..b2f6af9c1b 100644
--- a/themes/metro/scss/_codemirror.scss
+++ b/themes/metro/scss/_codemirror.scss
@@ -8,12 +8,14 @@ $textarea-rows: 15 !default;
   height: 20rem;
   border: 1px solid #ccc;
   direction: ltr;
+}
 
+// Code mirror default style (do not affect the console style)
+.CodeMirror.cm-s-default {
   // @see: issue #17705
   div.CodeMirror-scroll {
     margin-right: 0;
     padding-bottom: 0;
-    overflow: hidden !important;
   }
 }
 
diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss
index 194a575d4b..9690c9e7b2 100644
--- a/themes/original/scss/_common.scss
+++ b/themes/original/scss/_common.scss
@@ -436,7 +436,6 @@ div#modalOverlay {
 }
 
 #login_form label {
-  width: 10em;
   font-weight: bolder;
 }
 
@@ -1788,9 +1787,32 @@ input#auto_increment_opt {
   }
 }
 
-input.btn {
+input.btn,
+button.btn {
+  border-color: $btn-border-color;
   color: #333;
   background-color: #d0dce0;
+
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: #8b9aa0;
+    border-color: $btn-border-color;
+  }
+}
+
+button.jsPrintButton {
+  background-color: unset;
+  border-color: unset;
+  border: unset;
+
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: unset;
+    border-color: unset;
+    border: unset;
+  }
 }
 
 body .ui-widget {
diff --git a/themes/original/scss/_variables.scss b/themes/original/scss/_variables.scss
index c51283ac98..35206a0af8 100644
--- a/themes/original/scss/_variables.scss
+++ b/themes/original/scss/_variables.scss
@@ -55,6 +55,7 @@ $bg-two: #d5d5d5;
 
 $body-bg: #f5f5f5;
 $body-color: $main-color;
+$primary: $navi-pointer-background;
 
 // Links
 
@@ -63,6 +64,10 @@ $link-decoration: none;
 $link-hover-color: #f00;
 $link-hover-decoration: underline;
 
+// Buttons
+
+$btn-border-color: black;
+
 // Components
 
 $border-radius: 0;
diff --git a/themes/pmahomme/scss/_codemirror.scss b/themes/pmahomme/scss/_codemirror.scss
index 20da936870..0caa7da603 100644
--- a/themes/pmahomme/scss/_codemirror.scss
+++ b/themes/pmahomme/scss/_codemirror.scss
@@ -4,12 +4,14 @@ $textarea-rows: 15;
 .CodeMirror {
   height: 20rem;
   direction: ltr;
+}
 
+// Code mirror default style (do not affect the console style)
+.CodeMirror.cm-s-default {
   // @see: issue #17705
   div.CodeMirror-scroll {
     margin-right: 0;
     padding-bottom: 0;
-    overflow: hidden !important;
   }
 }
 
diff --git a/yarn.lock b/yarn.lock
index 4607a0aa0e..498a9a432c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2191,10 +2191,10 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
-codemirror@5.65.3:
-  version "5.65.3"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.3.tgz#2d029930d5a293bc5fb96ceea64654803c0d4ac7"
-  integrity sha512-kCC0iwGZOVZXHEKW3NDTObvM7pTIyowjty4BUqeREROc/3I6bWbgZDA3fGDwlA+rbgRjvnRnfqs9SfXynel1AQ==
+codemirror@5.65.9:
+  version "5.65.9"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.9.tgz#ec70c92aa206ee4c9853d5f1e7c4ed356cdab68c"
+  integrity sha512-19Jox5sAKpusTDgqgKB5dawPpQcY+ipQK7xoEI+MVucEF9qqFaXpeqY1KaoyGBso/wHQoDa4HMMxMjdsS3Zzzw==
 
 collect-v8-coverage@^1.0.0:
   version "1.0.1"