X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fdba.php;h=1d3b432141d525e015539b5b3a6864f5153749ca;hb=6dda5366ded349288b65eb7bc7c88b909a04626d;hp=d2f631c0640d84e936b5466ca4373e5e5f029ebe;hpb=b1a668a3ea805bc08f8fa02cca9b38083d5af9eb;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index d2f631c064..1d3b432141 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,5 +1,6 @@
 <?php
 
+use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
@@ -24,7 +25,7 @@ class dba {
 	private static $in_transaction = false;
 	private static $relation = [];
 
-	public static function connect($serveraddr, $user, $pass, $db, $install = false) {
+	public static function connect($serveraddr, $user, $pass, $db) {
 		if (!is_null(self::$db)) {
 			return true;
 		}
@@ -51,7 +52,7 @@ class dba {
 			return false;
 		}
 
-		if ($install) {
+		if ($a->mode == App::MODE_INSTALL) {
 			// server has to be a non-empty string that is not 'localhost' and not an IP
 			if (strlen($server) && ($server !== 'localhost') && filter_var($server, FILTER_VALIDATE_IP) === false) {
 				if (! dns_get_record($server, DNS_A + DNS_CNAME)) {
@@ -93,6 +94,7 @@ class dba {
 
 		// No suitable SQL driver was found.
 		if (!self::$connected) {
+			self::$driver = null;
 			self::$db = null;
 		}
 		$a->save_timestamp($stamp1, "network");