From 870b321052f6164d0dbc64f5593328cf93158e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 14 Apr 2003 12:59:09 +0000
Subject: [PATCH] Fixed bug #720672 - moved headers

---
 ChangeLog                      | 1 +
 libraries/display_tbl.lib.php3 | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5559686bb..6b7dfbbb08 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ $Source$
     * lang/catalan: Updated, thanks to Xavier Navarro.
     * footer.inc.php3: Fixed for quotes, HTML entities and other weird
       characters in db/table name.
+    * libraries/display_tbl.lib.php3: Fixed bug #720672 - moved headers.
 
 2003-04-14 Garvin Hicking <me@supergarv.de>
     * libraries/common.lib.php3: Fixed SHOW TABLE STATUS LIKE ... FROM ...
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 9deb34fa60..01baa79dab 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -485,7 +485,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         //     ... before the result table
         if (($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
             && $is_display['text_btn'] == '1') {
-            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 1;
+            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 0;
             if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
                 ?>
     <td colspan="<?php echo $fields_cnt; ?>" align="center">
@@ -513,7 +513,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         //     ... at the left column of the result table header if possible
         //     and required
         else if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && $is_display['text_btn'] == '1') {
-            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 1;
+            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 0;
             if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
                 echo "\n";
                 ?>
@@ -534,7 +534,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         //     ... else if no button, displays empty(ies) col(s) if required
         else if ($GLOBALS['cfg']['ModifyDeleteAtLeft']
                  && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')) {
-            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 1;
+            $vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 2 : 0;
             if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
                 echo "\n";
                 ?>