X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FInstall.php;h=7ba40396659927f15df9f6b28b3759c33c2d4e13;hb=c0cb1a194e0392233f3644557c8e4bcf84f5a686;hp=54c6141cc725fcda67362dabab8284aa674ee5ba;hpb=753c41bb401d49aecea95fe3327e8a4f4bc6182f;p=friendica.git

diff --git a/src/Module/Install.php b/src/Module/Install.php
index 54c6141cc7..7ba4039665 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -10,7 +10,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException;
 use Friendica\Util\BasePath;
-use Friendica\Util\BaseURL;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
@@ -67,7 +66,8 @@ class Install extends BaseModule
 
 		// get basic installation information and save them to the config cache
 		$configCache = $a->getConfigCache();
-		self::$installer->setUpCache($configCache, BasePath::create($a->getBasePath(), $_SERVER));
+		$basePath = new BasePath($a->getBasePath());
+		self::$installer->setUpCache($configCache, $basePath->getPath());
 
 		// We overwrite current theme css, because during install we may not have a working mod_rewrite
 		// so we may not have a css at all. Here we set a static css file for the install procedure pages
@@ -110,7 +110,7 @@ class Install extends BaseModule
 				self::checkSetting($configCache, $_POST, 'database', 'database', '');
 
 				// If we cannot connect to the database, return to the previous step
-				if (!self::$installer->checkDB($configCache, $a->getProfiler())) {
+				if (!self::$installer->checkDB($a->getDBA())) {
 					self::$currentWizardStep = self::DATABASE_CONFIG;
 				}
 
@@ -134,7 +134,7 @@ class Install extends BaseModule
 				self::checkSetting($configCache, $_POST, 'config', 'admin_email', '');
 
 				// If we cannot connect to the database, return to the Database config wizard
-				if (!self::$installer->checkDB($configCache, $a->getProfiler())) {
+				if (!self::$installer->checkDB($a->getDBA())) {
 					self::$currentWizardStep = self::DATABASE_CONFIG;
 					return;
 				}
@@ -179,9 +179,9 @@ class Install extends BaseModule
 
 			case self::BASE_CONFIG:
 				$ssl_choices = [
-					BaseURL::SSL_POLICY_NONE     => L10n::t("No SSL policy, links will track page SSL state"),
-					BaseURL::SSL_POLICY_FULL     => L10n::t("Force all links to use SSL"),
-					BaseURL::SSL_POLICY_SELFSIGN => L10n::t("Self-signed certificate, use SSL for local links only \x28discouraged\x29")
+					App\BaseURL::SSL_POLICY_NONE     => L10n::t("No SSL policy, links will track page SSL state"),
+					App\BaseURL::SSL_POLICY_FULL     => L10n::t("Force all links to use SSL"),
+					App\BaseURL::SSL_POLICY_SELFSIGN => L10n::t("Self-signed certificate, use SSL for local links only \x28discouraged\x29")
 				];
 
 				$tpl    = Renderer::getMarkupTemplate('install_base.tpl');