X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=htconfig.php;h=0e838bd90d6e28a1d0e8ed87b719633e3b1d28d2;hb=12d0f4bf3c17fb650036e301bb677ff736d5c178;hp=c078103e81207426233a518c50fe240868714b97;hpb=2cdcd13e68d882ff8d68c0b201f820c16ecf7201;p=friendica.git

diff --git a/htconfig.php b/htconfig.php
index c078103e81..0e838bd90d 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -21,11 +21,18 @@ $db_user = 'mysqlusername';
 $db_pass = 'mysqlpassword';
 $db_data = 'mysqldatabasename';
 
-// Set this variable to true if you want to use environment variables for mysql
-$db_use_env_vars = false; 
-if ($db_use_env_vars) {
+// 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'))
+	&& !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');
 }