Merge branch 'QA_4_8'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Apr 3, 2019 · 914756a · 914756a
2 parents 0868cd1 + cae7efe
commit 914756a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -88,6 +88,7 @@ phpMyAdmin - ChangeLog
 - issue #14334 Fixed export table structure shows rows fields
 - issue #15010 Fixed empty SQL preview modal on tbl_relation
 - issue #14673 Fixed innodb & MySQL 8: DYNAMIC & COMPRESSED ROW_FORMAT missing
+- issue        Fixed empty success message when adding a new INDEX from left panel
 
 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
@@ -3807,18 +3807,8 @@ function indexEditorDialog (url, title, callback_success, callback_failure) {
             }
             if (typeof data !== 'undefined' && data.success === true) {
                 PMA_ajaxShowMessage(data.message);
-                var $resultQuery = $('.result_query');
-                if ($resultQuery.length) {
-                    $resultQuery.remove();
-                }
-                if (data.sql_query) {
-                    $('<div class="result_query"></div>')
-                        .html(data.sql_query)
-                        .prependTo('#page_content');
-                    PMA_highlightSQL($('#page_content'));
-                }
+                PMA_highlightSQL($('.result_query'));
                 $('.result_query .notice').remove();
-                $resultQuery.prepend(data.message);
                 /* Reload the field form*/
                 $('#table_index').remove();
                 $('<div id=\'temp_div\'><div>')

diff --git a/js/vendor/zxcvbn.js b/js/vendor/zxcvbn.js