Merged patch #438708 (Changes to display_table)
This commit is contained in:
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
|
||||
$Id$
|
||||
$Source$
|
||||
|
||||
2001-07-05 Lo<4C>c Chapeaux <lolo@phpheaven.net>
|
||||
* lib.inc.php3: Patch #438708 (Changes to display_table) thanks to
|
||||
Thomas Kl<4B>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<4C>c Chapeaux <lolo@phpheaven.net>
|
||||
|
15
lib.inc.php3
15
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)
|
||||
{
|
||||
if(!isset($row[$i]))
|
||||
$row[$i] = '';
|
||||
$primary = mysql_fetch_field($dt_result,$i);
|
||||
if(!isset($row[$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 ---------------------------
|
||||
|
Reference in New Issue
Block a user