Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MAINT_3_5_2' into QA_3_5
  • Loading branch information
mynetx committed Jun 30, 2012
2 parents cf228c1 + a5b8039 commit 76645d2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
- bug #3534121 [config] duplicate line in config.sample.inc.php
- bug #3534311 [interface] Grid editing incorrectly parses ENUM/SET values
- bug #3510196 [core] More clever URL rewriting with ForceSSL
- bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore

3.5.1.0 (2012-05-03)
- bug #3510784 [edit] Limit clause ignored when sort order is remembered
Expand Down
2 changes: 1 addition & 1 deletion js/sql.js
Expand Up @@ -305,7 +305,7 @@ $(document).ready(function() {

$.post($form.attr('action'), $form.serialize(), function(data) {
$("#sqlqueryresults")
.html(data)
.html(data.sql_query ? data.sql_query : data)
.trigger('makegrid');
PMA_init_slider();

Expand Down

0 comments on commit 76645d2

Please sign in to comment.