From 32c532d474c83ed0b2cc811eb78087c6c0df8018 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <me@supergarv.de>
Date: Thu, 29 Apr 2004 15:50:45 +0000
Subject: [PATCH] Bug #942362 - Colspan off by one

---
 ChangeLog                |  3 +++
 db_details_structure.php | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 084446933..2401696c1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-04-29 Garvin Hicking <pma@supergarv.de>
+    * db_details_structure.php: Bug #942362 - Colspan off by one
+
 2004-04-29 Marc Delisle  <lem9@users.sourceforge.net>
     * scripts/create-release.sh: keep only one previous version in cvs-prev
     * lang/estonian: Updated, thanks to Alvar Soome (finsoft).
diff --git a/db_details_structure.php b/db_details_structure.php
index 281e8ff3a..934855ded 100644
--- a/db_details_structure.php
+++ b/db_details_structure.php
@@ -19,7 +19,7 @@ if (isset($db) && isset($db_rename) && $db_rename == 'true') {
         PMA_DBI_query($local_query);
         $tables = PMA_DBI_get_tables($db);
         foreach ($tables as $table) {
-            $local_query = 'RENAME TABLE ' 
+            $local_query = 'RENAME TABLE '
                 . PMA_backquote($db) . '.' . PMA_backquote($table)
                 . ' TO '
                 . PMA_backquote($newname) . '.' . PMA_backquote($table)
@@ -564,9 +564,21 @@ else {
     // Check all tables url
     $checkall_url = 'db_details_structure.php?' . PMA_generate_common_url($db);
     echo "\n";
+
+    $basecolspan = 9;
+    if (!($cfg['PropertiesNumColumns'] > 1)) {
+        $basecolspan++;
+        if (PMA_MYSQL_INT_VERSION >= 40100) {
+            $basecolspan++;
+        }
+    }
+
+    if ($cfg['ShowStats']) {
+        $basecolspan += 2;
+    }
     ?>
             <tr>
-                <td colspan="<?php echo (($cfg['ShowStats']) ? '11' : '10'); ?>" valign="bottom">
+                <td colspan="<?php echo $basecolspan; ?>" valign="bottom">
                     <img src="./images/arrow_<?php echo $text_dir; ?>.gif" border="0" width="38" height="22" alt="<?php echo $strWithChecked; ?>" />
                     <a href="<?php echo $checkall_url; ?>&amp;checkall=1" onclick="setCheckboxes('tablesForm', true); return false;">
                         <?php echo $strCheckAll; ?></a>
@@ -689,7 +701,7 @@ echo '        ' . '&nbsp;<input type="submit" value="' . $strGo . '" />' . "\n";
     <li>
         <form method="post" action="db_details_structure.php"
             onsubmit="return emptyFormElements(this, 'newname')">
-            <?php echo $strDBRename; ?>: 
+            <?php echo $strDBRename; ?>:
             <input type="hidden" name="db_rename" value="true" />
             <?php echo PMA_generate_common_hidden_inputs($db); ?>
             <input type="text" name="newname" class="textfield" value="" />