From d6d52dbb030335a8a2c179d8b32e7b9237c77352 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 27 Jun 2008 15:08:21 +0000
Subject: [PATCH] bug #2001005 [GUI] ARCHIVE cannot have indexes

---
 ChangeLog         |  1 +
 tbl_structure.php | 31 ++++++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 933c452d2..42f17f321 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1989813 [interface] Deleting multiple views (space in name) 
 - bug #1992628 [parser] SQL parser removes essential space 
 - bug #1989281 [export] Export fails if one table is marked as crashed
+- bug #2001005 [GUI] ARCHIVE cannot have indexes 
 
 2.11.7.0 (2008-06-23)
 - bug #1908719 [interface] New field cannot be auto-increment and primary key 
diff --git a/tbl_structure.php b/tbl_structure.php
index 5cd22e7f6..858eaec81 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -416,7 +416,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
     </td>
     <td align="center">
         <?php
-        if ($type == 'text' || $type == 'blob') {
+        if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type) {
             echo $titles['NoPrimary'] . "\n";
         } else {
             echo "\n";
@@ -431,7 +431,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
     </td>
     <td align="center">
         <?php
-        if ($type == 'text' || $type == 'blob') {
+        if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type) {
             echo $titles['NoUnique'] . "\n";
         } else {
             echo "\n";
@@ -445,7 +445,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
     </td>
     <td align="center">
         <?php
-        if ($type == 'text' || $type == 'blob') {
+        if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type) {
             echo $titles['NoIndex'] . "\n";
         } else {
             echo "\n";
@@ -515,9 +515,11 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
         if ($fields_cnt > 1) {
             PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_drop', $strDrop, 'b_drop.png');
         }
-        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', $strPrimary, 'b_primary.png');
-        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', $strUnique, 'b_unique.png');
-        PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', $strIndex, 'b_index.png');
+        if ('ARCHIVE' != $tbl_type) {
+            PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', $strPrimary, 'b_primary.png');
+            PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', $strUnique, 'b_unique.png');
+            PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', $strIndex, 'b_index.png');
+        }
         if ((!empty($tbl_type) && $tbl_type == 'MYISAM')) {
             PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', $strIdxFulltext, 'b_ftext.png');
         }
@@ -527,12 +529,14 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
             echo '<i>' . $strOr . '</i>' . "\n"
                . '<input type="submit" name="submit_mult" value="' . $strDrop . '" title="' . $strDrop . '" />' . "\n";
         }
-        echo '<i>' . $strOr . '</i>' . "\n"
-           . '<input type="submit" name="submit_mult" value="' . $strPrimary . '" title="' . $strPrimary . '" />' . "\n";
-        echo '<i>' . $strOr . '</i>' . "\n"
-           . '<input type="submit" name="submit_mult" value="' . $strIndex . '" title="' . $strIndex . '" />' . "\n";
-        echo '<i>' . $strOr . '</i>' . "\n"
-           . '<input type="submit" name="submit_mult" value="' . $strUnique . '" title="' . $strUnique . '" />' . "\n";
+        if ('ARCHIVE' != $tbl_type) {
+            echo '<i>' . $strOr . '</i>' . "\n"
+                . '<input type="submit" name="submit_mult" value="' . $strPrimary . '" title="' . $strPrimary . '" />' . "\n";
+            echo '<i>' . $strOr . '</i>' . "\n"
+                . '<input type="submit" name="submit_mult" value="' . $strIndex . '" title="' . $strIndex . '" />' . "\n";
+            echo '<i>' . $strOr . '</i>' . "\n"
+                . '<input type="submit" name="submit_mult" value="' . $strUnique . '" title="' . $strUnique . '" />' . "\n";
+        }
         if ((!empty($tbl_type) && $tbl_type == 'MYISAM')) {
             echo '<i>' . $strOr . '</i>' . "\n"
                . '<input type="submit" name="submit_mult" value="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" />' . "\n";
@@ -618,7 +622,8 @@ echo "\n\n";
  * Displays indexes
  */
 echo '<div id="tablestatistics">' . "\n";
-if (! $tbl_is_view && ! $db_is_information_schema) {
+// $tbl_type is a global variable from libraries/tbl_info.inc.php
+if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' !=  $tbl_type) {
     define('PMA_IDX_INCLUDED', 1);
     require './tbl_indexes.php';
 }