beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't use PHP 5 only function (bug #2214423)

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@537 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2008-11-01 20:38:06 +00:00
parent 8c51ca2e53
commit a055d87f66
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
schema.inc.php
View file

@ -39,7 +39,7 @@ while ($row = $result->fetch_assoc()) {
while ($lefts[(string) $left]) { while ($lefts[(string) $left]) {
$left -= .0001; $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"]; $referenced[$val["table"]][$row["Name"]][(string) $left] = $val["target"];
$lefts[(string) $left] = true; $lefts[(string) $left] = true;
} }
@ -137,10 +137,10 @@ foreach ($schema as $name => $table) {
echo ($field["primary"] ? "<em>$val</em>" : $val) . "<br />\n"; echo ($field["primary"] ? "<em>$val</em>" : $val) . "<br />\n";
} }
foreach ((array) $table["references"] as $target_name => $refs) { foreach ((array) $table["references"] as $target_name => $refs) {
foreach ($refs as $left => $columns) { foreach ($refs as $left => $ref) {
$left1 = $left - $table_pos[$name][1]; $left1 = $left - $table_pos[$name][1];
$i = 0; $i = 0;
foreach ($columns as $source => $target) { foreach ($ref[0] as $source) {
echo '<div class="references" title="' . htmlspecialchars($target_name) . "\" id='refs$left-" . ($i++) . "' style='left: $left1" . "em; top: " . $table["fields"][$source]["pos"] . "em; padding-top: .5em;'><div style='border-top: 1px solid Gray; width: " . (-$left1) . "em;'></div></div>\n"; echo '<div class="references" title="' . htmlspecialchars($target_name) . "\" id='refs$left-" . ($i++) . "' style='left: $left1" . "em; top: " . $table["fields"][$source]["pos"] . "em; padding-top: .5em;'><div style='border-top: 1px solid Gray; width: " . (-$left1) . "em;'></div></div>\n";
} }
} }
@ -161,9 +161,9 @@ foreach ($schema as $name => $table) {
foreach ($refs as $left => $ref) { foreach ($refs as $left => $ref) {
$min_pos = $top; $min_pos = $top;
$max_pos = -10; $max_pos = -10;
foreach ($ref as $source => $target) { foreach ($ref[0] as $key => $source) {
$pos1 = $table["pos"][0] + $table["fields"][$source]["pos"]; $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); $min_pos = min($min_pos, $pos1, $pos2);
$max_pos = max($max_pos, $pos1, $pos2); $max_pos = max($max_pos, $pos1, $pos2);
} }