[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-14-g82ac1e8

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  82ac1e8028b5ec7d5b95e5cf2a2e47c452dfa5c5 (commit)
      from  7afbe60f2b612b0ee0d222bad8c4867c7acbebac (commit)


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

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

diff --git a/ChangeLog b/ChangeLog
index 3fed26b..5b012bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 - bug #3304544 [parser] master is not a reserved word
 - bug #3307616 [edit] Inline edit updates multiple duplicate rows
 - patch #3311539 [edit] Inline edit does not escape backslashes
+- bug #3313210 [interface] Columns class sometimes changed for nothing
 
 3.4.2.0 (2011-06-07)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
diff --git a/js/sql.js b/js/sql.js
index 73a2b78..7e8bccf 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -1145,14 +1145,14 @@ $(document).ready(function() {
     /**
      * vertical column highlighting in horizontal mode when hovering over the column header
      */
-    $('.column_heading').live('hover', function() {
+    $('.column_heading.pointer').live('hover', function() {
         PMA_changeClassForColumn($(this), 'hover');
         });
 
     /**
      * vertical column marking in horizontal mode when clicking the column header
      */
-    $('.column_heading').live('click', function() {
+    $('.column_heading.pointer').live('click', function() {
         PMA_changeClassForColumn($(this), 'marked');
         });
 })
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index c0ab854..c5b46fb 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -867,6 +867,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
                     $th_class[] = 'condition';
                 }
                 $th_class[] = 'column_heading';
+                if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) {
+                    $th_class[] = 'pointer';
+                }
                 echo ' class="' . implode(' ', $th_class) . '"';
 
                 if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {


hooks/post-receive
-- 
phpMyAdmin