From 71771cadde81eed44c7961572ef3d34cb821d8e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Thu, 5 Jul 2001 20:20:09 +0000
Subject: [PATCH] Merged patch #438708 (Changes to display_table)

---
 ChangeLog    |  4 ++++
 lib.inc.php3 | 15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eedeb65aa..1bf0c1a5a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+2001-07-05  Loïc Chapeaux  <lolo@phpheaven.net>
+	* lib.inc.php3: Patch #438708 (Changes to display_table) thanks to
+	  Thomas Kläger.
+
 2001-07-04  Marc Delisle  <lem9@users.sourceforge.net>
 	* bug #438319 (IE 5.5 and "Add a new user"): user_details.php3, 
 	  thanks to Loïc Chapeaux  <lolo@phpheaven.net>
diff --git a/lib.inc.php3 b/lib.inc.php3
index bd1ef9776..44879469a 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -410,18 +410,25 @@ function display_table ($dt_result, $is_simple = false) {
         echo "<tr bgcolor=$bgcolor>";
         for($i=0; $i<mysql_num_fields($dt_result); ++$i)
         {
+            $primary = mysql_fetch_field($dt_result,$i);
             if(!isset($row[$i]))
-	      $row[$i] = '';
-	    $primary = mysql_fetch_field($dt_result,$i);
+				{
+					$row[$i] = '';
+					$condition = " $primary->name IS NULL AND";
+				}
+				else
+				{
+					$condition = " $primary->name = '".addslashes($row[$i])."' AND";
+				}
             if($primary->numeric == 1) {
 	      if($sql_query == "SHOW PROCESSLIST")
 		$Id = $row[$i];
             }
             if($primary->primary_key > 0)
-                $primary_key .= " $primary->name = '".addslashes($row[$i])."' AND";
+                $primary_key .= $condition;
             //begin correction uva 19991216 pt. 2 ---------------------------
             //see pt. 1, above, for description of change
-            $uva_nonprimary_condition .= " $primary->name = '".addslashes($row[$i])."' AND";
+            $uva_nonprimary_condition .= $condition;
             //end correction uva 19991216 pt. 2 -----------------------------
         }
         //begin correction uva 19991216 pt. 3 ---------------------------