From f863002e95e864939923e286ba18e7adfbb786e7 Mon Sep 17 00:00:00 2001 From: Robin Appelman <icewind1991@gmail.com> Date: Mon, 13 Jun 2011 23:18:39 +0200 Subject: [PATCH] use sqlite3 if sqlite2 isn't available --- lib/setup.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/setup.php b/lib/setup.php index 72507f221b..ab4a786c43 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -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 { } } -?> \ No newline at end of file +?> -- GitLab