Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 21:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Database $_SERVER usage and remove old .travis files

Browse source
This commit is contained in:
Philipp 2020-08-19 12:28:34 +02:00
parent 0b98d67b80
commit 16591077ac
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
7 changed files with 10 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Database/Database.php
View file

@ -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']))
{