Use $adminer->database() instead of DB (thanks to Lubor Bilek)

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 821f258e3d1c3b2baa28ac839ea1568f1e6f3986..42f5a1a782ed01768f6d52c7ff533d329d941fe3 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -17,10 +17,12 @@ if (isset($_GET["pgsql"])) {
                        }
                        
                        function connect($server, $username, $password) {
+                               global $adminer;
+                               $db = $adminer->database();
                                set_error_handler(array($this, '_error'));
                                $this->_string = "host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' user='" . addcslashes($username, "'\\") . "' password='" . addcslashes($password, "'\\") . "'";
-                               $this->_link = @pg_connect($this->_string . (DB != "" ? " dbname='" . addcslashes(DB, "'\\") . "'" : " dbname='template1'"), PGSQL_CONNECT_FORCE_NEW);
-                               if (!$this->_link && DB != "") {
+                               $this->_link = @pg_connect($this->_string . ($db != "" ? " dbname='" . addcslashes($db, "'\\") . "'" : " dbname='template1'"), PGSQL_CONNECT_FORCE_NEW);
+                               if (!$this->_link && $db != "") {
                                        // try to connect directly with database for performance
                                        $this->_database = false;
                                        $this->_link = @pg_connect("$this->_string dbname='template1'", PGSQL_CONNECT_FORCE_NEW);
@@ -39,7 +41,8 @@ if (isset($_GET["pgsql"])) {
                        }
                        
                        function select_db($database) {
-                               if ($database == DB) {
+                               global $adminer;
+                               if ($database == $adminer->database()) {
                                        return $this->_database;
                                }
                                $return = @pg_connect("$this->_string dbname='" . addcslashes($database, "'\\") . "'", PGSQL_CONNECT_FORCE_NEW);
@@ -126,14 +129,17 @@ if (isset($_GET["pgsql"])) {
                        var $extension = "PDO_PgSQL";
                        
                        function connect($server, $username, $password) {
+                               global $adminer;
+                               $db = $adminer->database();
                                $string = "pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' options='-c client_encoding=utf8'";
-                               $this->dsn($string . (DB != "" ? " dbname='" . addcslashes(DB, "'\\") . "'" : ""), $username, $password);
+                               $this->dsn($string . ($db != "" ? " dbname='" . addcslashes($db, "'\\") . "'" : ""), $username, $password);
                                //! connect without DB in case of an error
                                return true;
                        }
                        
                        function select_db($database) {
-                               return (DB == $database);
+                               global $adminer;
+                               return ($adminer->database() == $database);
                        }
                        
                        function close() {