X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FDBA.php;h=79c4422718c6057fb9280a011472ceb19451b42d;hb=910e832dc28f6fcedf31ba4456888221612fd1da;hp=4027f56d4e1bc5c5aec2ff6b1d8bae2a82543bd3;hpb=4ba91d4ea19cbffde1b25bf019bfe276e47914b0;p=friendica.git

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 4027f56d4e..79c4422718 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -8,10 +8,10 @@ namespace Friendica\Database;
 
 use Friendica\Core\System;
 use Friendica\Util\DateTimeFormat;
+use mysqli;
 use PDO;
 use PDOException;
 use PDOStatement;
-use mysqli;
 
 /**
  * @class MySQL database class
@@ -50,6 +50,7 @@ class DBA
 		self::$db_name = $db;
 		self::$db_charset = $charset;
 
+		$port = 0;
 		$serveraddr = trim($serveraddr);
 
 		$serverdata = explode(':', $serveraddr);
@@ -73,7 +74,7 @@ class DBA
 			self::$driver = 'pdo';
 			$connect = "mysql:host=".$server.";dbname=".$db;
 
-			if (isset($port)) {
+			if ($port > 0) {
 				$connect .= ";port=".$port;
 			}
 
@@ -89,9 +90,15 @@ class DBA
 			}
 		}
 
-		if (!self::$connected && class_exists('mysqli')) {
+		if (!self::$connected && class_exists('\mysqli')) {
 			self::$driver = 'mysqli';
-			self::$db = @new mysqli($server, $user, $pass, $db, $port);
+
+			if ($port > 0) {
+				self::$db = @new mysqli($server, $user, $pass, $db, $port);
+			} else {
+				self::$db = @new mysqli($server, $user, $pass, $db);
+			}
+
 			if (!mysqli_connect_errno()) {
 				self::$connected = true;
 
@@ -281,7 +288,7 @@ class DBA
 	 * @param string $sql An SQL string without the values
 	 * @return string The input SQL string modified if necessary.
 	 */
-	public static function any_value_fallback($sql) {
+	public static function anyValueFallback($sql) {
 		$server_info = self::server_info();
 		if (version_compare($server_info, '5.7.5', '<') ||
 			(stripos($server_info, 'MariaDB') !== false)) {
@@ -390,7 +397,7 @@ class DBA
 		}
 
 		$sql = self::clean_query($sql);
-		$sql = self::any_value_fallback($sql);
+		$sql = self::anyValueFallback($sql);
 
 		$orig_sql = $sql;
 
@@ -644,6 +651,10 @@ class DBA
 
 		$fields = [];
 
+		if (empty($condition)) {
+			return DBStructure::existsTable($table);
+		}
+
 		reset($condition);
 		$first_key = key($condition);
 		if (!is_int($first_key)) {
@@ -693,7 +704,7 @@ class DBA
 	 *
 	 * @return int Number of rows
 	 */
-	public static function affected_rows() {
+	public static function affectedRows() {
 		return self::$affected_rows;
 	}