nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #942362 - Colspan of results table off by one.

Browse Source
This commit is contained in:
Garvin Hicking
2004-04-27 09:43:55 +00:00
parent 32cc65c1d2
commit 876fda03b2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -10,6 +10,8 @@ $Source$
calendar. calendar.
2004-04-27 Garvin Hicking <pma@supergarv.de> 2004-04-27 Garvin Hicking <pma@supergarv.de>
* libraries/display_tbl.lib.php: Bug #942362 - Colspan of results
table off by one.
* db_datadict.php: Bug #942359 - Data dictionary had wrong <div>- * db_datadict.php: Bug #942359 - Data dictionary had wrong <div>-
count. Replace h1 with h2 for consitency count. Replace h1 with h2 for consitency
* libraries/display_tbl.lib.php, tbl_row_delete: Bug #942356, * libraries/display_tbl.lib.php, tbl_row_delete: Bug #942356,

5
libraries/display_tbl.lib.php
View File

@@ -521,11 +521,12 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
$span = $fields_cnt; $span = $fields_cnt;
if ($is_display['edit_lnk'] != 'nn') $span++;
if ($is_display['del_lnk'] != 'nn') $span++;
if ($is_display['del_lnk'] != 'kp' && $is_display['del_lnk'] != 'nn') $span++;
} else { } else {
$span = $num_rows + floor($num_rows/$repeat_cells) + 1; $span = $num_rows + floor($num_rows/$repeat_cells) + 1;
} }
if ($is_display['edit_lnk'] != 'nn') $span++;
if ($is_display['del_lnk'] != 'nn') $span++;
?> ?>
<tr> <tr>