[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-15-g2d56821

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  2d56821c0f1337ae3fec7e845a396e2b0448fdeb (commit)
      from  82ac1e8028b5ec7d5b95e5cf2a2e47c452dfa5c5 (commit)


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

Summary of changes:
 js/sql.js                     |    2 +-
 libraries/display_tbl.lib.php |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index 7e8bccf..26075d4 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -1152,7 +1152,7 @@ $(document).ready(function() {
     /**
      * vertical column marking in horizontal mode when clicking the column header
      */
-    $('.column_heading.pointer').live('click', function() {
+    $('.column_heading.marker').live('click', function() {
         PMA_changeClassForColumn($(this), 'marked');
         });
 })
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index c5b46fb..64a0383 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -870,6 +870,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
                 if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) {
                     $th_class[] = 'pointer';
                 }
+                if ($GLOBALS['cfg']['BrowseMarkerEnable'] == true) {
+                    $th_class[] = 'marker';
+                }
                 echo ' class="' . implode(' ', $th_class) . '"';
 
                 if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {


hooks/post-receive
-- 
phpMyAdmin