Fixes:

- fixed missing variable $port (MySQL: 3306)
- "imported" mysqli class

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/boot.php b/boot.php
index 4c3a8c5ca88f371647cd3e02d675218c17d5c390..0aeb551a55029a03e362f1a804a934b30154302a 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -768,14 +768,14 @@ function run_update_function($x, $prefix)
                        return false;
                } else {
                        Config::set('database', $funcname, 'success');
-                       if ($post_update) {
+                       if (isset($post_update)) {
                                Config::set('system', 'build', $x);
                        }
                        return true;
                }
        } else {
                Config::set('database', $funcname, 'success');
-               if ($post_update) {
+               if (isset($post_update)) {
                        Config::set('system', 'build', $x);
                }
                return true;

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 51b2c8898e6b49524d6d0000c6d146ad17aa6092..dbf9b41ca27c61b826852404a79f3769d9a83688 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -8,6 +8,7 @@ namespace Friendica\Database;
 
 use Friendica\Core\System;
 use Friendica\Util\DateTimeFormat;
+use mysqli;
 use PDO;
 use PDOException;
 use PDOStatement;
@@ -50,6 +51,7 @@ class DBA
                self::$db_name = $db;
                self::$db_charset = $charset;
 
+               $port = 3306;
                $serveraddr = trim($serveraddr);
 
                $serverdata = explode(':', $serveraddr);
@@ -89,7 +91,7 @@ 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 (!mysqli_connect_errno()) {