X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=htconfig.php;fp=htconfig.php;h=87c1301abd602526a4ba30d6288130c302c63f03;hb=eaa3e4d15737413848244410878f7eca3f6a9741;hp=0e838bd90d6e28a1d0e8ed87b719633e3b1d28d2;hpb=4752ea13749373de36b32e0d4a7fe11e742f363c;p=friendica.git

diff --git a/htconfig.php b/htconfig.php
index 0e838bd90d..87c1301abd 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -23,17 +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_USER')))
-	&& !empty(getenv('MYSQL_PASSWORD'))
+	&& !getenv('MYSQL_PASSWORD') === false
 	&& !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'))) {
 		$db_user = getenv('MYSQL_USERNAME');
-	} elseif (!empty(getenv('MYSQL_USER'))) {
+	} else {
 		$db_user = getenv('MYSQL_USER');
 	}
-	$db_pass = getenv('MYSQL_PASSWORD');
+	$db_pass = (string) getenv('MYSQL_PASSWORD');
 	$db_data = getenv('MYSQL_DATABASE');
 }