friendica
/
friendica
의 미러 https://github.com/friendica/friendica
6
0
포크 1
코드 이슈 Packages Projects 릴리즈 1 위키 활동

Remove exception for legacy config file in App->loadDatabase

This commit is contained in:
Hypolite Petovan 2018-07-17 02:05:36 -04:00
부모 7b8efcc23d
커밋 007ec92ae4
1개의 변경된 파일과 10개의 추가작업 그리고 7개의 파일을 삭제
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/App.php
파일 보기

@ -337,6 +337,15 @@ class App
$a = $this;
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);
if (isset($default_timezone)) {
@ -526,12 +535,6 @@ class App
}
$db_pass = (string) getenv('MYSQL_PASSWORD');
$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);
@ -539,7 +542,7 @@ class App
\dba::connect($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');
}
/**