friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changes: 

- Database->$driver can no longer be NULL, an empty string is fine anyway
pull/11665/head
Roland Häder 2022-06-21 13:04:05 +02:00
parent 945cd1a2c2
commit 1080a840f5
No known key found for this signature in database
GPG Key ID: C82EDE5DDFA0BA77
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Database/DBA.php
View File

@ -77,7 +77,7 @@ class DBA
* *
* @return string with either "pdo" or "mysqli" * @return string with either "pdo" or "mysqli"
*/ */
public static function getDriver() public static function getDriver(): string
{ {
return DI::dba()->getDriver(); return DI::dba()->getDriver();
} }

6
src/Database/Database.php
View File

@ -64,7 +64,7 @@ class Database
protected $server_info = ''; protected $server_info = '';
/** @var PDO|mysqli */ /** @var PDO|mysqli */
protected $connection; protected $connection;
protected $driver; protected $driver = '';
protected $pdo_emulate_prepares = false; protected $pdo_emulate_prepares = false;
private $error = false; private $error = false;
private $errorno = 0; private $errorno = 0;
@ -181,7 +181,7 @@ class Database
// No suitable SQL driver was found. // No suitable SQL driver was found.
if (!$this->connected) { if (!$this->connected) {
$this->driver = null; $this->driver = '';
$this->connection = null; $this->connection = null;
} }
@ -233,7 +233,7 @@ class Database
} }
} }
$this->driver = null; $this->driver = '';
$this->connected = false; $this->connected = false;
} }