[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19906-g1c48e6a

[Marc Delisle]

The branch, master has been updated
       via  1c48e6a817746e4f37f1ec685850abdcbdf7b7ff (commit)
       via  1eeddcd08260b3467b6e5aa5eadd0a0a694867df (commit)
      from  16c5e7bab03d3651b05470bd1dcdf89a8998c08d (commit)


- Log -----------------------------------------------------------------
commit 1c48e6a817746e4f37f1ec685850abdcbdf7b7ff
Merge: 16c5e7b 1eeddcd
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Sep 25 07:45:59 2011 -0400

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

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

diff --git a/ChangeLog b/ChangeLog
index cd028c7..4805ea2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog
 - bug #3411535 [display] Full text button unchecks results display options
 - bug #3411224 [display] Broken binary column when 'Show binary contents' is not set
 - bug #3411633 [core] Call to undefined function PMA_isSuperuser()
+- bug #3413743 [interface] Display options link missing after search
 
 3.4.5.0 (2011-09-14)
 - bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 00e3a57..1808b73 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -77,6 +77,8 @@ $(document).ready(function() {
                 $('#togglesearchformdiv')
                  // now it's time to show the div containing the link 
                  .show();
+                 // needed for the display options slider in the results
+                 PMA_init_slider();
             } else {
                 // error message (zero rows)
                 $("#sqlqueryresults").html(response['message']);


hooks/post-receive
-- 
phpMyAdmin