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

Bug #839834

Browse Source
This commit is contained in:
Garvin Hicking
2003-11-11 11:55:24 +00:00
parent 4fa3369d85
commit 610bdeb205
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2003-11-11 Garvin Hicking <antikarneval@supergarv.de> 2003-11-11 Garvin Hicking <antikarneval@supergarv.de>
* libraries/display_tbl.lib.php3: Added more secure checks * libraries/display_tbl.lib.php3: Added more secure checks
for each'ing on arrays built by the query analyzer. (Bug #839630) for each'ing on arrays built by the query analyzer. (Bug #839630)
* libraries/display_tbl.lib.php3: Fixed Bug #839834 - Colspan for
repeated headers were wrong since introduction of multi-row delete.
2003-11-10 Marc Delisle <lem9@users.sourceforge.net> 2003-11-10 Marc Delisle <lem9@users.sourceforge.net>
* scripts/extchg.sh: bug 839081: generator.sh was not converted * scripts/extchg.sh: bug 839081: generator.sh was not converted

10
libraries/display_tbl.lib.php3
View File

@@ -625,7 +625,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
// ... before the result table // ... before the result table
if (($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn') if (($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
&& $is_display['text_btn'] == '1') { && $is_display['text_btn'] == '1') {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 0; $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 0;
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
?> ?>
<td colspan="<?php echo $fields_cnt; ?>" align="center"> <td colspan="<?php echo $fields_cnt; ?>" align="center">
@@ -653,7 +653,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
// ... at the left column of the result table header if possible // ... at the left column of the result table header if possible
// and required // and required
else if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && $is_display['text_btn'] == '1') { else if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && $is_display['text_btn'] == '1') {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 0; $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 0;
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
echo "\n"; echo "\n";
?> ?>
@@ -674,7 +674,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
// ... else if no button, displays empty(ies) col(s) if required // ... else if no button, displays empty(ies) col(s) if required
else if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] else if ($GLOBALS['cfg']['ModifyDeleteAtLeft']
&& ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')) { && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')) {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 0; $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 0;
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
echo "\n"; echo "\n";
?> ?>
@@ -858,7 +858,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
if ($GLOBALS['cfg']['ModifyDeleteAtRight'] if ($GLOBALS['cfg']['ModifyDeleteAtRight']
&& ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn') && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')
&& $is_display['text_btn'] == '1') { && $is_display['text_btn'] == '1') {
$vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 1; $vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 1;
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
echo "\n"; echo "\n";
?> ?>
@@ -881,7 +881,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
else if ($GLOBALS['cfg']['ModifyDeleteAtRight'] else if ($GLOBALS['cfg']['ModifyDeleteAtRight']
&& ($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn') && ($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
&& (!$GLOBALS['is_header_sent'])) { && (!$GLOBALS['is_header_sent'])) {
$vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 1; $vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 3 : 1;
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
echo "\n"; echo "\n";
?> ?>