From a055d87f66c4bceef0417a51a141be463a37ff60 Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Sat, 1 Nov 2008 20:38:06 +0000 Subject: [PATCH] Don't use PHP 5 only function (bug #2214423) git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@537 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- schema.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/schema.inc.php b/schema.inc.php index 6c087bba..2f557d5f 100644 --- a/schema.inc.php +++ b/schema.inc.php @@ -39,7 +39,7 @@ while ($row = $result->fetch_assoc()) { while ($lefts[(string) $left]) { $left -= .0001; } - $schema[$row["Name"]]["references"][$val["table"]][(string) $left] = array_combine($val["source"], $val["target"]); + $schema[$row["Name"]]["references"][$val["table"]][(string) $left] = array($val["source"], $val["target"]); $referenced[$val["table"]][$row["Name"]][(string) $left] = $val["target"]; $lefts[(string) $left] = true; } @@ -137,10 +137,10 @@ foreach ($schema as $name => $table) { echo ($field["primary"] ? "$val" : $val) . "
\n"; } foreach ((array) $table["references"] as $target_name => $refs) { - foreach ($refs as $left => $columns) { + foreach ($refs as $left => $ref) { $left1 = $left - $table_pos[$name][1]; $i = 0; - foreach ($columns as $source => $target) { + foreach ($ref[0] as $source) { echo '
\n"; } } @@ -161,9 +161,9 @@ foreach ($schema as $name => $table) { foreach ($refs as $left => $ref) { $min_pos = $top; $max_pos = -10; - foreach ($ref as $source => $target) { + foreach ($ref[0] as $key => $source) { $pos1 = $table["pos"][0] + $table["fields"][$source]["pos"]; - $pos2 = $schema[$target_name]["pos"][0] + $schema[$target_name]["fields"][$target]["pos"]; + $pos2 = $schema[$target_name]["pos"][0] + $schema[$target_name]["fields"][$ref[1][$key]]["pos"]; $min_pos = min($min_pos, $pos1, $pos2); $max_pos = max($max_pos, $pos1, $pos2); }