From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 4 May 2018 13:49:36 +0000 (+0200)
Subject: MongoDB: Consolidate code
X-Git-Tag: v4.6.3~22
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=c3cfc0e69be6a9424febf2647d426807fd12e695;p=adminer.git

MongoDB: Consolidate code
---

diff --git a/adminer/drivers/mongo.inc.php b/adminer/drivers/mongo.inc.php
index 356c8704..bb827153 100644
--- a/adminer/drivers/mongo.inc.php
+++ b/adminer/drivers/mongo.inc.php
@@ -10,7 +10,7 @@ if (isset($_GET["mongo"])) {
 			var $extension = "Mongo", $server_info = MongoClient::VERSION, $error, $last_id, $_link, $_db;
 
 			function connect($uri, $options) {
-				$this->_link = @new MongoClient($uri, $options);
+				return @new MongoClient($uri, $options);
 			}
 			
 			function query($query) {
@@ -205,7 +205,7 @@ if (isset($_GET["mongo"])) {
 
 			function connect($uri, $options) {
 				$class = 'MongoDB\Driver\Manager';
-				$this->_link = new $class($uri, $options);
+				return new $class($uri, $options);
 			}
 
 			function query($query) {
@@ -619,7 +619,7 @@ if (isset($_GET["mongo"])) {
 			$options["db"] = $db;
 		}
 		try {
-			$connection->connect("mongodb://$server", $options);
+			$connection->_link = $connection->connect("mongodb://$server", $options);
 			return $connection;
 		} catch (Exception $ex) {
 			$connection->error = $ex->getMessage();