Merge pull request #9044 from annando/avatar-stuff

[friendica.git] / src / Database / Database.php

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 0b38c24ba336b9ab27308dcdbfddeb2f0cca567e..4b96205a9adbb8c3bafde329a9b64e7ee76b43d5 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -59,7 +59,7 @@ class Database
        /** @var PDO|mysqli */
        protected $connection;
        protected $driver;
-       private $emulate_prepares = false;
+       protected $emulate_prepares = false;
        private $error          = false;
        private $errorno        = 0;
        private $affected_rows  = 0;
@@ -88,7 +88,7 @@ class Database
        {
                // Use environment variables for mysql if they are set beforehand
                if (!empty($server['MYSQL_HOST'])
-                   && (!empty($server['MYSQL_USERNAME'] || !empty($server['MYSQL_USER'])))
+                   && (!empty($server['MYSQL_USERNAME']) || !empty($server['MYSQL_USER']))
                    && $server['MYSQL_PASSWORD'] !== false
                    && !empty($server['MYSQL_DATABASE']))
                {