Replace x() by isset(), !empty() or defaults()

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 845560a4d676df27d4d3548eb8d1b88b1123bd15..6f95b8edb7d1994637012409b7f7a078eb965dc3 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -549,7 +549,7 @@ class App
 
                // Use environment variables for mysql if they are set beforehand
                if (!empty(getenv('MYSQL_HOST'))
-                       && (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
+                       && !empty(getenv('MYSQL_USERNAME') || !empty(getenv('MYSQL_USER')))
                        && getenv('MYSQL_PASSWORD') !== false
                        && !empty(getenv('MYSQL_DATABASE')))
                {
@@ -668,7 +668,7 @@ class App
                        $this->hostname = Core\Config::get('config', 'hostname');
                }
 
-               return $scheme . '://' . $this->hostname . (!empty($this->getURLPath()) ? '/' . $this->getURLPath() : '' );
+               return $scheme . '://' . $this->hostname . !empty($this->getURLPath() ? '/' . $this->getURLPath() : '' );
        }
 
        /**