From 4b6bfcd1a4129f3ceea18e82311f5434f4eda60f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 23 May 2001 18:21:45 +0000
Subject: [PATCH] Bug #424237

---
 ChangeLog       |  3 ++
 tbl_change.php3 | 75 ++++++++++++++++++++++++++++++++-----------------
 2 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ae2b1df8f..258796de8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+2001-05-22  Marc Delisle  <lem9@users.sourceforge.net>
+        * Bug #424237: cannot set an enum field to Null
+
 2001-05-21  Marc Delisle  <lem9@users.sourceforge.net>
         * add a message $strTextAreaLength to tell users when a textarea
           contents is too large to be editable ( > 32K)
diff --git a/tbl_change.php3 b/tbl_change.php3
index a63205e0d..ad1a617b4 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -94,31 +94,56 @@ for($i=0;$i<mysql_num_rows($table_def);$i++)
         $set = ereg_replace("\\)$", "", $set);
         $set = explode(",", $set);
 
-		// show dropdown or radio depend on length
-		if (strlen($row_table_def["Type"]) > 20) {
-			echo "<td><select name=fields[$field]>\n";
-			echo "<option value=\"\">\n";
-			for($j=0; $j<count($set);$j++)
-			{
-				echo '<option value="'.substr($set[$j], 1, -1).'"';
-				if($data == substr($set[$j], 1, -1) || ($data == "" && substr($set[$j], 1, -1) == $row_table_def["Default"]))
-					echo " selected";
-				echo ">".htmlspecialchars(substr($set[$j], 1, -1))."\n";
-			}
-			echo "</select></td>";
-		}
-		else {
-			echo "<td>\n";
-			for($j=0; $j<count($set);$j++)
-			{
-				echo "<input type=radio name=fields[$field] ";
-				echo 'value="'.substr($set[$j], 1, -1).'"';
-				if($data == substr($set[$j], 1, -1) || ($data == "" && substr($set[$j], 1, -1) == $row_table_def["Default"]))
-					echo " checked";
-				echo ">".htmlspecialchars(substr($set[$j], 1, -1))."\n";
-			}
-			echo "</td>";
-		}
+	// show dropdown or radio depend on length
+        if (strlen($row_table_def["Type"]) > 20) {
+         echo "<td><select name=fields[$field]>\n";
+         echo "<option value=\"\">\n";
+         for($j=0; $j<count($set);$j++)
+         {
+           echo '<option value="'.substr($set[$j], 1, -1).'"';
+           if   ($data == substr($set[$j], 1, -1)
+             || (  $data == ""
+                && substr($set[$j], 1, -1) == $row_table_def["Default"]))
+              echo " selected";
+
+           echo ">".htmlspecialchars(substr($set[$j], 1, -1))."\n";
+         }
+         echo "</select></td>";
+        }
+       else {
+         echo "<td>\n";
+
+         $seenchecked = 0;
+         for($j=0; $j<count($set);$j++)
+         {
+           echo "<input type=radio name=fields[$field] ";
+           echo 'value="'.substr($set[$j], 1, -1).'"';
+           if   ($data == substr($set[$j], 1, -1)
+             || (     $data == ""
+                   && substr($set[$j], 1, -1) == $row_table_def["Default"]
+                   && $row_table_def["Null"] != "YES"))
+
+// To be able to display a checkmark in the [Null] box when the field
+// is null, we lose the ability to display a checkmark besides the default value
+           {
+                echo " checked";
+                $seenchecked=1;
+           }
+           echo ">".htmlspecialchars(substr($set[$j], 1, -1))."\n";
+         }
+
+           if ($row_table_def["Null"] == "YES") {
+                echo "<input type=\"radio\"
+                             name=fields[$field]
+                             value=\"null\"";
+
+                if ($seenchecked==0)
+                   echo " checked";
+
+                echo ">[$strNull]";
+           }
+           echo "</td>";
+         }
 
     }
     elseif(strstr($row_table_def["Type"], "set"))