keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove exception for legacy config file in App->loadDatabase

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-17 02:05:36 -04:00
parent 7b8efcc23d
commit 007ec92ae4
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/App.php
View file

@ -337,6 +337,15 @@ class App
$a = $this; $a = $this;
include $this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php'; include $this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php';
$this->setConfigValue('database', 'hostname', $db_host);
$this->setConfigValue('database', 'username', $db_user);
$this->setConfigValue('database', 'password', $db_pass);
$this->setConfigValue('database', 'database', $db_data);
if (isset($a->config['system']['db_charset'])) {
$this->setConfigValue('database', 'charset', $a->config['system']['db_charset']);
}
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
if (isset($default_timezone)) { if (isset($default_timezone)) {
@ -526,12 +535,6 @@ class App
} }
$db_pass = (string) getenv('MYSQL_PASSWORD'); $db_pass = (string) getenv('MYSQL_PASSWORD');
$db_data = getenv('MYSQL_DATABASE'); $db_data = getenv('MYSQL_DATABASE');
} elseif (file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php')) {
$a = new \stdClass();
include $this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php';
$charset = isset($a->config["system"]["db_charset"]) ? $a->config["system"]["db_charset"] : $charset;
unset($a);
} }
$stamp1 = microtime(true); $stamp1 = microtime(true);
@ -539,7 +542,7 @@ class App
\dba::connect($db_host, $db_user, $db_pass, $db_data, $charset); \dba::connect($db_host, $db_user, $db_pass, $db_data, $charset);
unset($db_host, $db_user, $db_pass, $db_data, $charset); unset($db_host, $db_user, $db_pass, $db_data, $charset);
$this->save_timestamp($stamp1, "network"); $this->save_timestamp($stamp1, 'network');
} }
/** /**