From f924fd65694934957cdeedf22e405f31af1c1af9 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 10 Feb 2002 00:31:14 +0000
Subject: [PATCH] clarification

---
 ChangeLog               |  1 +
 tbl_properties.inc.php3 | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a80285e6..3e193e96a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ $Source$
 	* main.php3, libraries/auth/cookie.auth.lib.php3, Patch
 	  495360 (cookie with domain), experimental, thanks to
 	  Piotr Roszatycki (d3xter) and Christoph (certelt).
+	* tbl_properties.inc.php3: clarifications
 
 2002-02-09 Loïc Chapeaux  <lolo@phpheaven.net>
 	* libraries/functions.js: improved the "mark row" feature (it wasn't
diff --git a/tbl_properties.inc.php3 b/tbl_properties.inc.php3
index a1d3f2125..0b49d02a5 100755
--- a/tbl_properties.inc.php3
+++ b/tbl_properties.inc.php3
@@ -34,18 +34,15 @@ $is_backup = ($action != 'tbl_create.php3' && $action != 'tbl_addfield.php3');
         <th><?php echo $strDefault; ?></th>
         <th><?php echo $strExtra; ?></th>
 <?php
+// We could remove this 'if' and let the key information be shown and
+// editable.  However, for this to work, tbl_alter must be modified
+// to use the key fields, as tbl_addfield does.
+
 if (!$is_backup) {
-    if (empty($num_indexes)) {
-        echo "        <th>$strPrimary</th>\n";
-        echo "        <th>$strIndex</th>\n";
-        echo "        <th>$strUnique</th>\n";
-        echo "        <th>$strIdxFulltext</th>\n";
-    } else {
-        for ($i = 0; $i < $num_indexes; $i++) {
-            echo "        <th>$strSequence</th>\n";
-            echo "        <th>$strLength</th>\n";
-        } // end for
-    } // end if
+    echo "        <th>$strPrimary</th>\n";
+    echo "        <th>$strIndex</th>\n";
+    echo "        <th>$strUnique</th>\n";
+    echo "        <th>$strIdxFulltext</th>\n";
 }
 ?>
     </tr>
@@ -212,8 +209,8 @@ for ($i = 0 ; $i < $num_fields; $i++) {
             </select>
         </td>
     <?php
+// See my other comment about removing this 'if'.
     if (!$is_backup) {
-        if (empty($num_indexes)) {
             if (isset($row) && isset($row['Key']) && $row['Key'] == 'PRI') {
                 $checked_primary = ' checked="checked"';
             } else {
@@ -256,7 +253,6 @@ for ($i = 0 ; $i < $num_fields; $i++) {
                 <?php
             } // end if (PMA_MYSQL_INT_VERSION >= 32323)
             echo "\n";
-        } // end if (empty($num_indexes))
     } // end if ($action ==...)
     echo "\n";
     ?>