From 03e149270b65141e189096e64f1f0538867c1de5 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 14 Apr 2019 14:40:26 +0200
Subject: [PATCH] bugfix

---
 src/Core/Installer.php | 5 +----
 src/Module/Install.php | 2 +-
 src/Util/BaseURL.php   | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 2df398fb0d..782a139e14 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -11,7 +11,6 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
 use Friendica\Util\Logger\VoidLogger;
-use Friendica\Util\BasePath;
 use Friendica\Util\Network;
 use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
@@ -140,8 +139,6 @@ class Installer
 	{
 		$basepath = $configCache->get('system', 'basepath');
 
-		$url = $configCache->get('system', 'url');
-
 		$tpl = Renderer::getMarkupTemplate('local.config.tpl');
 		$txt = Renderer::replaceMacros($tpl, [
 			'$dbhost'    => $configCache->get('database', 'hostname'),
@@ -154,7 +151,7 @@ class Installer
 			'$hostname'  => $configCache->get('config', 'hostname'),
 
 			'$urlpath'   => $configCache->get('system', 'urlpath'),
-			'$baseurl'   => $url,
+			'$baseurl'   => $configCache->get('system', 'url'),
 			'$sslpolicy' => $configCache->get('system', 'ssl_policy'),
 			'$basepath'  => $basepath,
 			'$timezone'  => $configCache->get('system', 'default_timezone'),
diff --git a/src/Module/Install.php b/src/Module/Install.php
index 1402c58cd2..65a30e894b 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -231,7 +231,7 @@ class Install extends BaseModule
 						$configCache->get('database', 'hostname'),
 						'',
 						'required'],
-					'$dbuser  '   => ['database-username',
+					'$dbuser'     => ['database-username',
 						L10n::t('Database Login Name'),
 						$configCache->get('database', 'username'),
 						'',
diff --git a/src/Util/BaseURL.php b/src/Util/BaseURL.php
index cd703a9177..be34de30ec 100644
--- a/src/Util/BaseURL.php
+++ b/src/Util/BaseURL.php
@@ -285,7 +285,7 @@ class BaseURL
 		if (empty($this->url)) {
 			$this->determineBaseUrl();
 
-			if (!empty($url)) {
+			if (!empty($this->url)) {
 				$this->config->set('system', 'url', $this->url);
 			}
 		}