X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=htconfig.php;h=0e838bd90d6e28a1d0e8ed87b719633e3b1d28d2;hb=379f35d2d9ac3537bf99fd3da45c16dc7d13db14;hp=beec41c9c0b263ca2af06bd521cdbf58cbe84f1e;hpb=c66c09d5fd86e74ac6f1b877143e8cf55e3a0340;p=friendica.git

diff --git a/htconfig.php b/htconfig.php
index beec41c9c0..0e838bd90d 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -23,12 +23,16 @@ $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'))) {
+	&& !empty(getenv('MYSQL_PORT'))
+	&& (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
+	&& !empty(getenv('MYSQL_PASSWORD'))
+	&& !empty(getenv('MYSQL_DATABASE'))) {
 	$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
-	$db_user = getenv('MYSQL_USERNAME');
+	if (!empty(getenv('MYSQL_USERNAME'))) {
+		$db_user = getenv('MYSQL_USERNAME');
+	} elseif (!empty(getenv('MYSQL_USER'))) {
+		$db_user = getenv('MYSQL_USER');
+	}
 	$db_pass = getenv('MYSQL_PASSWORD');
 	$db_data = getenv('MYSQL_DATABASE');
 }