Merge branch 'bug/phpinfo-accessible-hotfix' into develop

[friendica.git] / tests / Util / Database / StaticDatabase.php

diff --git a/tests/Util/Database/StaticDatabase.php b/tests/Util/Database/StaticDatabase.php
index c3037974f1b0602a550c6ada04042659063b61c0..73a142d9a9c32931648f009a571c3f3c15674ed5 100644 (file)
--- a/tests/Util/Database/StaticDatabase.php
+++ b/tests/Util/Database/StaticDatabase.php
@@ -56,8 +56,8 @@ class StaticDatabase extends Database
                $this->driver = 'pdo';
                $this->connection = self::$staticConnection;
                $this->connected = true;
-
-               $this->setTestmode(true);
+               $this->emulate_prepares = false;
+               $this->pdo_emulate_prepares = false;
 
                return $this->connected;
        }
@@ -101,7 +101,7 @@ class StaticDatabase extends 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']))
                {