Fix boolean values in test data

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index 2cbbf6335dcc55113ff40798ab2960eafcc53a93..87c1301abd602526a4ba30d6288130c302c63f03 100644 (file)
--- 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_USERNAME')) || !empty(getenv('MYSQL_USER')))
+       && !getenv('MYSQL_PASSWORD') === false
        && !empty(getenv('MYSQL_DATABASE'))) {
-       $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
-       $db_user = getenv('MYSQL_USERNAME');
-       $db_pass = getenv('MYSQL_PASSWORD');
+       $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');
 }