Close </ul> of logins

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 09f9add880cd63f179be2345c4ce5b2617176d03..467220c899336e6483871b24c4ed51c28e78344f 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -927,23 +927,22 @@ class Adminer {
 </h1>
 <?php
                if ($missing == "auth") {
-                       $first = true;
+                       $output = "";
                        foreach ((array) $_SESSION["pwds"] as $vendor => $servers) {
                                foreach ($servers as $server => $usernames) {
                                        foreach ($usernames as $username => $password) {
                                                if ($password !== null) {
-                                                       if ($first) {
-                                                               echo "<ul id='logins'>" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
-                                                               $first = false;
-                                                       }
                                                        $dbs = $_SESSION["db"][$vendor][$server][$username];
                                                        foreach (($dbs ? array_keys($dbs) : array("")) as $db) {
-                                                               echo "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a>\n";
+                                                               $output .= "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a>\n";
                                                        }
                                                }
                                        }
                                }
                        }
+                       if ($output) {
+                               echo "<ul id='logins'>\n$output</ul>\n" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
+                       }
                } else {
                        if ($_GET["ns"] !== "" && !$missing && DB != "") {
                                $connection->select_db(DB);

diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 5744039ed1c2c81596b3af23ec5c1bb98adb802d..9d583d3862f675e52e5f1168ce7407fa1ef22c55 100644 (file)
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.7.2";
+$VERSION = "4.7.3-dev";