fixing #6652 Manual installer bricked

diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index da078545e3eb0dd4c52c98ab0f329ca83fc1dd59..7f2585e63a3f359bfee056fbfa2f79a40bd59f21 100644 (file)
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -146,7 +146,7 @@ HELP;
 
                $installer->resetChecks();
 
-               if (!$installer->checkDB($db_host, $db_user, $db_pass, $db_data)) {
+               if (!$installer->checkDB($a->getConfig(), $db_host, $db_user, $db_pass, $db_data)) {
                        $errorMessage = $this->extractErrors($installer->getChecks());
                        throw new RuntimeException($errorMessage);
                }

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 7e79f29f153dd6efe81efc50993c19106c916032..02d95096101f1b0fc93b31bd5bac02492c8f5245 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -6,6 +6,7 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
+use Friendica\Core\Config\ConfigCache;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
@@ -581,17 +582,18 @@ class Installer
        /**
         * Checking the Database connection and if it is available for the current installation
         *
-        * @param string $dbhost Hostname/IP of the Friendica Database
-        * @param string $dbuser Username of the Database connection credentials
-        * @param string $dbpass Password of the Database connection credentials
-        * @param string $dbdata Name of the Database
+        * @param ConfigCache $configCache The configuration cache
+        * @param string $dbhost           Hostname/IP of the Friendica Database
+        * @param string $dbuser           Username of the Database connection credentials
+        * @param string $dbpass           Password of the Database connection credentials
+        * @param string $dbdata           Name of the Database
         *
         * @return bool true if the check was successful, otherwise false
         * @throws Exception
         */
-       public function checkDB($dbhost, $dbuser, $dbpass, $dbdata)
+       public function checkDB($configCache, $dbhost, $dbuser, $dbpass, $dbdata)
        {
-               if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
+               if (!DBA::connect($configCache, $dbhost, $dbuser, $dbpass, $dbdata)) {
                        $this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
 
                        return false;

diff --git a/src/Module/Install.php b/src/Module/Install.php
index 327e59422c9f97083b34ee6cf5133b3c2d03600c..6948dee6e0c52255c1f30d46c20c91b94a673769 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -75,7 +75,7 @@ class Install extends BaseModule
                                $dbdata  = Strings::escapeTags(trim(defaults($_POST, 'dbdata', '')));
 
                                // If we cannot connect to the database, return to the previous step
-                               if (!self::$installer->checkDB($dbhost, $dbuser, $dbpass, $dbdata)) {
+                               if (!self::$installer->checkDB($a->getConfig(), $dbhost, $dbuser, $dbpass, $dbdata)) {
                                        self::$currentWizardStep = self::DATABASE_CONFIG;
                                }
 
@@ -92,7 +92,7 @@ class Install extends BaseModule
                                $adminmail = Strings::escapeTags(trim(defaults($_POST, 'adminmail', '')));
 
                                // If we cannot connect to the database, return to the Database config wizard
-                               if (!self::$installer->checkDB($dbhost, $dbuser, $dbpass, $dbdata)) {
+                               if (!self::$installer->checkDB($a->getConfig(), $dbhost, $dbuser, $dbpass, $dbdata)) {
                                        self::$currentWizardStep = self::DATABASE_CONFIG;
                                        return;
                                }