The branch, master has been updated via 31bbba5e76a2007ecb30e1ef5673a52b551813f8 (commit) via 2d56821c0f1337ae3fec7e845a396e2b0448fdeb (commit) from b5e733a2e34128b7e2a33a1b76c206c5de97584c (commit)
- Log ----------------------------------------------------------------- commit 31bbba5e76a2007ecb30e1ef5673a52b551813f8 Merge: b5e733a2e34128b7e2a33a1b76c206c5de97584c 2d56821c0f1337ae3fec7e845a396e2b0448fdeb Author: Marc Delisle marc@infomarc.info Date: Tue Jun 7 11:44:31 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
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 39ed84b..3bc4f81 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 0ffbb9f..5b06b3e 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -877,6 +877,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