Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 07:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update use of environment variables in loadDatabase

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-06 21:08:48 -04:00
parent de7277ac69
commit d8096a402c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/App.php
View file

@ -504,22 +504,22 @@ class App
// Use environment variables for mysql if they are set beforehand // Use environment variables for mysql if they are set beforehand
if (!empty(getenv('MYSQL_HOST')) if (!empty(getenv('MYSQL_HOST'))
&& !empty(getenv('MYSQL_PORT'))
&& (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER'))) && (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
&& !empty(getenv('MYSQL_PASSWORD')) && !getenv('MYSQL_PASSWORD') === false
&& !empty(getenv('MYSQL_DATABASE'))) && !empty(getenv('MYSQL_DATABASE')))
{ {
$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'); $db_host = getenv('MYSQL_HOST');
if (!empty(getenv('MYSQL_PORT'))) {
$db_host .= ':' . getenv('MYSQL_PORT');
}
if (!empty(getenv('MYSQL_USERNAME'))) { if (!empty(getenv('MYSQL_USERNAME'))) {
$db_user = getenv('MYSQL_USERNAME'); $db_user = getenv('MYSQL_USERNAME');
} elseif (!empty(getenv('MYSQL_USER'))) { } else {
$db_user = getenv('MYSQL_USER'); $db_user = getenv('MYSQL_USER');
} }
$db_pass = (string) getenv('MYSQL_PASSWORD');
$db_pass = getenv('MYSQL_PASSWORD');
$db_data = getenv('MYSQL_DATABASE'); $db_data = getenv('MYSQL_DATABASE');
}elseif (file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php')) { } elseif (file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php')) {
$a = new \stdClass(); $a = new \stdClass();
include $this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php'; include $this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php';
$charset = isset($a->config["system"]["db_charset"]) ? $a->config["system"]["db_charset"] : $charset; $charset = isset($a->config["system"]["db_charset"]) ? $a->config["system"]["db_charset"] : $charset;