Merge branch 'QA_4_8'

Closes: #14964 Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Mar 6, 2019 · 06cda56 · 06cda56
2 parents 8d6596e + b8c31d3
commit 06cda56
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -45,6 +45,8 @@ phpMyAdmin - ChangeLog
 - issue #14870 Display correct date and time in Zip files
 - issue #14763 Fixed the loading symbol not appearing when refreshing the navigation
 - issue #14607 Count rows only if needed
+- issue #14832 Show Designer combo boxes when adding a constraint
+- issue #14948 Fix change password is not showing password strength difference at the second attempt
 
 4.8.5 (2019-01-25)
 - issue        Developer debug data was saved to the PHP error log

diff --git a/js/designer/move.js b/js/designer/move.js
@@ -1208,15 +1208,15 @@ function Click_field (db, T, f, PK) {
                 alert(PMA_messages.strPleaseSelectPrimaryOrUniqueKey);
                 return;// 0;
             }// PK
-            if (j_tabs[db + '.' + T] !== '1') {
+            if (j_tabs[db + '.' + T] !== 1) {
                 document.getElementById('foreign_relation').style.display = 'none';
             }
             click_field = 1;
             link_relation = 'DB1=' + db + argsep + 'T1=' + T + argsep + 'F1=' + f;
             document.getElementById('designer_hint').innerHTML = PMA_messages.strSelectForeignKey;
         } else {
             Start_relation(); // hidden hint...
-            if (j_tabs[db + '.' + T] !== '1' || !PK) {
+            if (j_tabs[db + '.' + T] !== 1 || !PK) {
                 document.getElementById('foreign_relation').style.display = 'none';
             }
             var left = Glob_X - (document.getElementById('layer_new_relation').offsetWidth >> 1);

diff --git a/libraries/classes/Display/ChangePassword.php b/libraries/classes/Display/ChangePassword.php
@@ -92,6 +92,7 @@ public static function getHtml($mode, $username, $hostname)
             . __('Enter:') . '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp'
             . '<input type="password" name="pma_pw" id="text_pma_change_pw" size="10" '
             . 'class="textfield"'
+            . 'onkeyup="checkPasswordStrength($(this).val(), $(\'#change_password_strength_meter\'), meter_obj_label = $(\'#change_password_strength\'), PMA_commonParams.get(\'user\'));" '
             . $chg_evt_handler . '="nopass[1].checked = true">'
             . '<span>Strength:</span> '
             . '<meter max="4" id="change_password_strength_meter" name="pw_meter"></meter> '