From 4e9c3db67d4f230cd774a583692ae1a69ae6920f Mon Sep 17 00:00:00 2001 From: Nisarg Jhaveri Date: Fri, 8 May 2015 19:58:46 +0530 Subject: [PATCH 1/2] Fix bug#4897 Signed-off-by: Nisarg Jhaveri --- js/functions.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/js/functions.js b/js/functions.js index 71d88d3301..06a59a3630 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1761,12 +1761,12 @@ function codemirrorAutocompleteOnInputRead(instance) { data: params, success: function (data) { if (data.success) { - sql_autocomplete = $.parseJSON(data.tables); + var tables = $.parseJSON(data.tables); sql_autocomplete_default_table = PMA_commonParams.get('table'); - var result = []; - for (var table in sql_autocomplete) { - if (sql_autocomplete.hasOwnProperty(table)) { - var columns = sql_autocomplete[table]; + sql_autocomplete = []; + for (var table in tables) { + if (tables.hasOwnProperty(table)) { + var columns = tables[table]; table = { text: table, columns: [] @@ -1786,9 +1786,9 @@ function codemirrorAutocompleteOnInputRead(instance) { } } } - result.push(table); + sql_autocomplete.push(table); } - instance.options.hintOptions.tables = result; + instance.options.hintOptions.tables = sql_autocomplete; instance.options.hintOptions.defaultTable = sql_autocomplete_default_table; } }, From 683088a4b8bf1abdb7bf84188b6914976dd5e49a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 9 May 2015 06:17:24 -0400 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index fd0c2a8a49..9fe46905d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #4896 Non-styled error page when following results link - bug #4894 Deleting without confirmation - bug #4858 Issues with SQL autocomplete +- bug #4897 Column hint in SQL autocomplete is sometimes not shown 4.4.6.0 (2015-05-07) - bug #4890 webkitStorageInfo and webkitIndexedDB is deprecated