bugfix

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 2df398fb0d0af6d4c6f64cca6a5ef069783bc118..782a139e14c0bff3100eb1415c5081ef6698bcab 100644 (file)
--- 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 1402c58cd29784cbd4c4846f36f99a9cdb60f2fa..65a30e894bed610c356318699910d7f1bc0b2f03 100644 (file)
--- 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 cd703a91776be65f273af0faa772b05472931915..be34de30ec5ceb9bb4aa06598d9ae3e1905442d2 100644 (file)
--- 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);
                        }
                }