diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-01-26 15:41:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 15:41:11 -0600 |
| commit | e21170bd1a751454bc8f6c541d5733ca88d25961 (patch) | |
| tree | 856e25f3196cf4636418eee713426eb76dcbd125 /lib | |
| parent | 43315e27f45cd67b84ed5c137cdd321838220ad3 (diff) | |
| parent | 4536ead454a45be9316bb79b9c10967826017178 (diff) | |
| download | nextcloud-server-e21170bd1a751454bc8f6c541d5733ca88d25961.tar.gz nextcloud-server-e21170bd1a751454bc8f6c541d5733ca88d25961.zip | |
Merge pull request #3246 from nextcloud/fix-sqlite-dependency
Remove useless dependency on SQLite (non-PDO)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Setup.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/private/Setup.php b/lib/private/Setup.php index 81a5343fe21..d9997767684 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -125,8 +125,8 @@ class Setup { public function getSupportedDatabases($allowAllDatabases = false) { $availableDatabases = array( 'sqlite' => array( - 'type' => 'class', - 'call' => 'SQLite3', + 'type' => 'pdo', + 'call' => 'sqlite', 'name' => 'SQLite' ), 'mysql' => array( @@ -163,9 +163,7 @@ class Setup { $type = $availableDatabases[$database]['type']; $call = $availableDatabases[$database]['call']; - if($type === 'class') { - $working = $this->class_exists($call); - } elseif ($type === 'function') { + if ($type === 'function') { $working = $this->is_callable($call); } elseif($type === 'pdo') { $working = in_array($call, $this->getAvailableDbDriversForPdo(), TRUE); |