use sqlite3 if sqlite2 isn't available

This commit is contained in:
Robin Appelman 2011-06-13 23:18:39 +02:00
parent 1e0fe05bef
commit f863002e95
1 changed files with 8 additions and 3 deletions

View File

@ -1,6 +1,6 @@
<?php
$hasSQLite = is_callable('sqlite_open');
$hasSQLite = (is_callable('sqlite_open') or class_exists('SQLite3'));
$hasMySQL = is_callable('mysql_connect');
$datadir = OC_CONFIG::getValue('datadir', $SERVERROOT.'/data');
$opts = array(
@ -65,10 +65,15 @@ class OC_SETUP {
$username = htmlspecialchars_decode($options['adminlogin']);
$password = htmlspecialchars_decode($options['adminpass']);
$datadir = htmlspecialchars_decode($options['directory']);
//if only sqlite3 is available use that.
if($dbtype=='sqlite' and !is_callable('sqlite_open')){
$dbtype='sqlite3';
}
//write the config file
OC_CONFIG::setValue('datadirectory', $datadir);
OC_CONFIG::setValue('dbtype', $dbtype);
OC_CONFIG::setValue('dbtype', $dbtype);
if($dbtype == 'mysql') {
$dbuser = $options['dbuser'];
$dbpass = $options['dbpass'];
@ -178,4 +183,4 @@ class OC_SETUP {
}
}
?>
?>