Bugfixings

[friendica.git] / src / Module / Install.php

diff --git a/src/Module/Install.php b/src/Module/Install.php
index e09f23a18daa6715227bac3596daedd8c6f744a2..2ef2c32299d1ba2a4033dcc4b8e7944c1efe3f96 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -87,7 +87,6 @@ class Install extends BaseModule
                                $dbuser    = notags(trim(defaults($_POST, 'dbuser', '')));
                                $dbpass    = notags(trim(defaults($_POST, 'dbpass', '')));
                                $dbdata    = notags(trim(defaults($_POST, 'dbdata', '')));
-                               $phpath    = notags(trim(defaults($_POST, 'phpath', '')));
                                $timezone  = notags(trim(defaults($_POST, 'timezone', Core\Installer::DEFAULT_TZ)));
                                $language  = notags(trim(defaults($_POST, 'language', Core\Installer::DEFAULT_LANG)));
                                $adminmail = notags(trim(defaults($_POST, 'adminmail', '')));
@@ -95,8 +94,11 @@ class Install extends BaseModule
                                // If we cannot connect to the database, return to the Database config wizard
                                if (!self::$installer->checkDB($dbhost, $dbuser, $dbpass, $dbdata)) {
                                        self::$currentWizardStep = self::DATABASE_CONFIG;
+                                       return;
                                }
 
+                               $phpath = self::$installer->getPHPPath();
+
                                if (!self::$installer->createConfig($phpath, $urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $timezone, $language, $adminmail, $a->getBasePath())) {
                                        return;
                                }