X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=htconfig.php;h=87c1301abd602526a4ba30d6288130c302c63f03;hb=ff24d0d567441b563f88f19374150ae8b4d264c1;hp=beec41c9c0b263ca2af06bd521cdbf58cbe84f1e;hpb=f63be91bd54fb29b3302bd259861fa92a0562067;p=friendica.git

diff --git a/htconfig.php b/htconfig.php
index beec41c9c0..87c1301abd 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -23,13 +23,19 @@ $db_data = 'mysqldatabasename';
 
 // Use environment variables for mysql if they are set beforehand
 if (!empty(getenv('MYSQL_HOST'))
-   && !empty(getenv('MYSQL_PORT'))
-   && !empty(getenv('MYSQL_USERNAME'))
-   && !empty(getenv('MYSQL_PASSWORD'))
-   && !empty(getenv('MYSQL_DATABASE'))) {
-	$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
-	$db_user = getenv('MYSQL_USERNAME');
-	$db_pass = getenv('MYSQL_PASSWORD');
+	&& (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
+	&& !getenv('MYSQL_PASSWORD') === false
+	&& !empty(getenv('MYSQL_DATABASE'))) {
+	$db_host = getenv('MYSQL_HOST');
+	if (!empty(getenv('MYSQL_PORT'))) {
+		$db_host .= ':' . getenv('MYSQL_PORT');
+	}
+	if (!empty(getenv('MYSQL_USERNAME'))) {
+		$db_user = getenv('MYSQL_USERNAME');
+	} else {
+		$db_user = getenv('MYSQL_USER');
+	}
+	$db_pass = (string) getenv('MYSQL_PASSWORD');
 	$db_data = getenv('MYSQL_DATABASE');
 }