Merge branch 'QA_4_8'

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

4 files changed, 18 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 423d7f3061..1b92a60a64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,6 +98,9 @@ phpMyAdmin - ChangeLog
 - issue #15177 Fixed label alignment on login page
 - issue #15210 Fixed a typo in the english name of the Albanian language
 - issue        Fixed issue when resetting charset in import.php
+- issue #14460 Fixed forms where submitted multiple times on CTRL + ENTER
+- issue #15038 Fixed console height was allowing a negative values
+- issue #15219 Fixed 'No Password' option does not switch automatically to 'Use Text Field' in add user account
 
 4.8.5 (2019-01-25)
 - issue        Developer debug data was saved to the PHP error log
diff --git a/js/functions.js b/js/functions.js
index b204d9b3db..257160fee6 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -4945,8 +4945,11 @@ AJAX.registerOnload('functions.js', function () {
     $('form input, form textarea, form select').on('keydown', function (e) {
         if ((e.ctrlKey && e.which === 13) || (e.altKey && e.which === 13)) {
             $form = $(this).closest('form');
-            if (! $form.find('input[type="submit"]') ||
-                ! $form.find('input[type="submit"]').trigger('click')
+
+            // There could be multiple submit buttons on the same form,
+            // we assume all of them behave identical and just click one.
+            if (! $form.find('input[type="submit"]:first') ||
+                ! $form.find('input[type="submit"]:first').trigger('click')
             ) {
                 $form.submit();
             }
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 5684be0857..aa3ffed903 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -131,6 +131,15 @@ AJAX.registerOnload('server_privileges.js', function () {
         checkPasswordStrength($(this).val(), meter_obj, meter_obj_label, username);
     });
 
+    /**
+     * Automatically switching to 'Use Text field' from 'No password' once start writing in text area
+     */
+    $('#text_pma_pw').on('input', function() {
+        if ($('#text_pma_pw').val() != '') {
+            $('#select_pred_password').val('userdefined');
+        }
+    });
+    
     $('#text_pma_change_pw').on('keyup', function () {
         meter_obj = $('#change_password_strength_meter');
         meter_obj_label = $('#change_password_strength');
diff --git a/libraries/config.values.php b/libraries/config.values.php
index d82471b350..2dcbd28ebc 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -352,7 +352,6 @@ return [
             'show',
             'collapse',
         ],
-        'Height' => 'integer',
         'OrderBy' => [
             'exec',
             'time',
@@ -376,6 +375,7 @@ return [
      * Use only full paths and form ids
      */
     '_validators' => [
+        'Console/Height' => 'validateNonNegativeNumber',
         'CharTextareaCols' => 'validatePositiveNumber',
         'CharTextareaRows' => 'validatePositiveNumber',
         'ExecTimeLimit' => 'validateNonNegativeNumber',