nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged patch #438708 (Changes to display_table)

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-07-05 20:20:09 +00:00
parent 73f889dd48
commit 71771cadde
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $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> 2001-07-04 Marc Delisle <lem9@users.sourceforge.net>
* bug #438319 (IE 5.5 and "Add a new user"): user_details.php3, * bug #438319 (IE 5.5 and "Add a new user"): user_details.php3,
thanks to Lo<4C>c Chapeaux <lolo@phpheaven.net> thanks to Lo<4C>c Chapeaux <lolo@phpheaven.net>

15
lib.inc.php3
View File

@@ -410,18 +410,25 @@ function display_table ($dt_result, $is_simple = false) {
echo "<tr bgcolor=$bgcolor>"; echo "<tr bgcolor=$bgcolor>";
for($i=0; $i<mysql_num_fields($dt_result); ++$i) for($i=0; $i<mysql_num_fields($dt_result); ++$i)
{ {
if(!isset($row[$i]))
$row[$i] = '';
$primary = mysql_fetch_field($dt_result,$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($primary->numeric == 1) {
if($sql_query == "SHOW PROCESSLIST") if($sql_query == "SHOW PROCESSLIST")
$Id = $row[$i]; $Id = $row[$i];
} }
if($primary->primary_key > 0) if($primary->primary_key > 0)
$primary_key .= " $primary->name = '".addslashes($row[$i])."' AND"; $primary_key .= $condition;
//begin correction uva 19991216 pt. 2 --------------------------- //begin correction uva 19991216 pt. 2 ---------------------------
//see pt. 1, above, for description of change //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 ----------------------------- //end correction uva 19991216 pt. 2 -----------------------------
} }
//begin correction uva 19991216 pt. 3 --------------------------- //begin correction uva 19991216 pt. 3 ---------------------------