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

Fix Auto-Installer

Browse source
This commit is contained in:
Philipp Holzer 2019-09-23 12:47:58 +02:00
parent c0afa761ac
commit ca36ea17f9
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
2 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/Database/Database.php
View file

@ -90,9 +90,12 @@ class Database
public function connect()
{
if (!is_null($this->connection) && $this->connected()) {
return true;
return $this->connected;
}
// Reset connected state
$this->connected = false;
$port = 0;
$serveraddr = trim($this->configCache->get('database', 'hostname'));
$serverdata = explode(':', $serveraddr);
@ -187,19 +190,20 @@ class Database
*/
public function disconnect()
{
if (is_null($this->connection)) {
return;
if (!is_null($this->connection)) {
switch ($this->driver) {
case 'pdo':
$this->connection = null;
break;
case 'mysqli':
$this->connection->close();
$this->connection = null;
break;
}
}
switch ($this->driver) {
case 'pdo':
$this->connection = null;
break;
case 'mysqli':
$this->connection->close();
$this->connection = null;
break;
}
$this->driver = null;
$this->connected = false;
}
/**
@ -369,6 +373,7 @@ class Database
$connected = $this->connection->ping();
break;
}
return $connected;
}