First available database or current user without list

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@949 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index ab031c0278e7f43a9c7481875a3eecd5ef4ea4d7..e6e4145356e3e3c5f7cd2db7130f597856a40e74 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -10,8 +10,12 @@ class Adminer {
        }
        
        function database() {
+               global $dbh;
                $dbs = get_databases(false);
-               return (count($dbs) == 1 ? $dbs[0] : (count($dbs) == 2 && information_schema($dbs[0]) ? $dbs[1] : 'test'));
+               return (!$dbs
+                       ? $dbh->result($dbh->query("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1)")) // username without the database list
+                       : $dbs[(information_schema($dbs[0]) ? 1 : 0)] // first available database
+               );
        }
        
        function loginForm($username) {