friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

bugfix

This commit is contained in:
Philipp Holzer 2019-04-14 14:40:26 +02:00
parent 58c9566c3d
commit 03e149270b
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/Installer.php
View File

@ -11,7 +11,6 @@ use Friendica\Database\DBA;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Util\Logger\VoidLogger; use Friendica\Util\Logger\VoidLogger;
use Friendica\Util\BasePath;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Profiler; use Friendica\Util\Profiler;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -140,8 +139,6 @@ class Installer
{ {
$basepath = $configCache->get('system', 'basepath'); $basepath = $configCache->get('system', 'basepath');
$url = $configCache->get('system', 'url');
$tpl = Renderer::getMarkupTemplate('local.config.tpl'); $tpl = Renderer::getMarkupTemplate('local.config.tpl');
$txt = Renderer::replaceMacros($tpl, [ $txt = Renderer::replaceMacros($tpl, [
'$dbhost' => $configCache->get('database', 'hostname'), '$dbhost' => $configCache->get('database', 'hostname'),
@ -154,7 +151,7 @@ class Installer
'$hostname' => $configCache->get('config', 'hostname'), '$hostname' => $configCache->get('config', 'hostname'),
'$urlpath' => $configCache->get('system', 'urlpath'), '$urlpath' => $configCache->get('system', 'urlpath'),
'$baseurl' => $url, '$baseurl' => $configCache->get('system', 'url'),
'$sslpolicy' => $configCache->get('system', 'ssl_policy'), '$sslpolicy' => $configCache->get('system', 'ssl_policy'),
'$basepath' => $basepath, '$basepath' => $basepath,
'$timezone' => $configCache->get('system', 'default_timezone'), '$timezone' => $configCache->get('system', 'default_timezone'),

2
src/Module/Install.php
View File

@ -231,7 +231,7 @@ class Install extends BaseModule
$configCache->get('database', 'hostname'), $configCache->get('database', 'hostname'),
'', '',
'required'], 'required'],
'$dbuser ' => ['database-username', '$dbuser' => ['database-username',
L10n::t('Database Login Name'), L10n::t('Database Login Name'),
$configCache->get('database', 'username'), $configCache->get('database', 'username'),
'', '',

2
src/Util/BaseURL.php
View File

@ -285,7 +285,7 @@ class BaseURL
if (empty($this->url)) { if (empty($this->url)) {
$this->determineBaseUrl(); $this->determineBaseUrl();
if (!empty($url)) { if (!empty($this->url)) {
$this->config->set('system', 'url', $this->url); $this->config->set('system', 'url', $this->url);
} }
} }