]> git.joonet.de Git - adminer.git/commitdiff
Avoid fatal in PostgreSQL without implemented database()
authorJakub Vrana <jakub@vrana.cz>
Thu, 13 Jun 2013 05:46:12 +0000 (07:46 +0200)
committerJakub Vrana <jakub@vrana.cz>
Thu, 13 Jun 2013 05:46:12 +0000 (07:46 +0200)
https://sourceforge.net/p/adminer/discussion/1095138/thread/5e29e380/

editor/include/adminer.inc.php

index 2e1acad695214daa29a26d15276796d39ac08000..04736fc0b427e7d46c08bbfddc8a2a07d4ddbaa0 100644 (file)
@@ -19,11 +19,13 @@ class Adminer {
        
        function database() {
                global $connection;
-               $databases = $this->databases(false);
-               return (!$databases
-                       ? $connection->result("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1)") // username without the database list
-                       : $databases[(information_schema($databases[0]) ? 1 : 0)] // first available database
-               );
+               if ($connection) {
+                       $databases = $this->databases(false);
+                       return (!$databases
+                               ? $connection->result("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1)") // username without the database list
+                               : $databases[(information_schema($databases[0]) ? 1 : 0)] // first available database
+                       );
+               }
        }
        
        function databases($flush = true) {