Merge branch 'QA_3_4'

This commit is contained in:
Marc Delisle 2011-06-07 11:44:31 -04:00
commit 31bbba5e76
2 changed files with 4 additions and 1 deletions

View File

@ -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');
});
})

View File

@ -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') {