Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

2013-12-26 14:40:04 +01:00 · 2013-12-26 14:40:04 +01:00 · 0bce051173
commit 0bce051173
parent 32c38e3965 9ab62d5e17
3 changed files with 3 additions and 0 deletions
--- a/1
+++ b/1
@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.1.3.0 (not yet released)
 - bug #3938 PDFDefaultPageSize doc and easy configurability
 - bug #4198 Hovering over pie chart gives fatal JS error
+- bug #4200 Missing syntax highlighting

 4.1.2.0 (2013-12-23)
 - bug #4178 Quick edit for BIT type does not work
--- a/js/makegrid.js
+++ b/js/makegrid.js
@ -1273,6 +1273,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                            if (typeof data.sql_query != 'undefined') {
                                // display feedback
                                $('#sqlqueryresults').prepend(data.sql_query);
+                                PMA_highlightSQL($('#result_query'));
                            }
                            // hide and/or update the successfully saved cells
                            g.hideEditCell(true, data);
--- a/js/sql.js
+++ b/js/sql.js
@ -289,6 +289,7 @@ AJAX.registerOnload('sql.js', function () {
                     .show()
                     .html(data.message);
                }
+                PMA_highlightSQL($('#result_query'));

                if (typeof data.ajax_reload != 'undefined') {
                    if (data.ajax_reload.reload) {