From: Jakub Vrana <jakub@vrana.cz>
Date: Thu, 13 Jun 2013 05:46:12 +0000 (+0200)
Subject: Avoid fatal in PostgreSQL without implemented database()
X-Git-Tag: v3.7.1~14
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=e680d220235a89838357208becc926c54af58d0c;p=adminer.git

Avoid fatal in PostgreSQL without implemented database()

https://sourceforge.net/p/adminer/discussion/1095138/thread/5e29e380/
---

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 2e1acad6..04736fc0 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -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) {