The branch, QA_3_5 has been updated via aa8eb9360b768d0056a096eff969f72e98785ed6 (commit) from a952ee531ab944bd19f0cb073a41d78a83001285 (commit)

- Log ----------------------------------------------------------------- -----------------------------------------------------------------------

Summary of changes: ChangeLog | 1 + js/tbl_select.js | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 308b374..787c57f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ phpMyAdmin - ChangeLog + patch #3303195 [interface] Checkbox to have SQL input remain - patch #3472899 [export] Fixed CSV escape for the export - patch #3475424 [import] Fixed CSV escape for the import +- bug #3482734 [interface] No warning on syntax error in search form

3.4.11.0 (not yet released)

diff --git a/js/tbl_select.js b/js/tbl_select.js index ac700f0..ba14495 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -73,7 +73,13 @@ $(document).ready(function() { PMA_init_slider(); } else { // error message (zero rows) - $("#sqlqueryresults").html(response['message']); + if (response.message != undefined) { + $("#sqlqueryresults").html(response['message']); + } + // other error (syntax error?) + if (response.error != undefined) { + $("#sqlqueryresults").html(response['error']); + } } }) // end $.post() })

hooks/post-receive