From eb4cd869107d4afa1c259751e765ca39defb9279 Mon Sep 17 00:00:00 2001 From: Daniel Köb Date: Fri, 30 Dec 2011 20:38:56 +0100 Subject: Include PostgreSQL when checking for available database drivers. Signed-off-by: Brice Maron --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/util.php') diff --git a/lib/util.php b/lib/util.php index 0f79948bc24..9cf78da6e90 100644 --- a/lib/util.php +++ b/lib/util.php @@ -175,8 +175,8 @@ class OC_Util { $errors=array(); //check for database drivers - if(!is_callable('sqlite_open') and !is_callable('mysql_connect')){ - $errors[]=array('error'=>'No database drivers (sqlite or mysql) installed.
','hint'=>'');//TODO: sane hint + if(!is_callable('sqlite_open') and !is_callable('mysql_connect') and !is_callable('pg_connect')){ + $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.
','hint'=>'');//TODO: sane hint } $CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" ); $CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" ); -- cgit v1.2.3 From 868a3b5364af550492794f2093ce0aa07b938c6c Mon Sep 17 00:00:00 2001 From: prcrst Date: Tue, 3 Jan 2012 12:37:33 +0100 Subject: Fix sqlite detection for Ubuntu 11.10 --- lib/util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/util.php') diff --git a/lib/util.php b/lib/util.php index 9cf78da6e90..009119b54a9 100644 --- a/lib/util.php +++ b/lib/util.php @@ -175,7 +175,7 @@ class OC_Util { $errors=array(); //check for database drivers - if(!is_callable('sqlite_open') and !is_callable('mysql_connect') and !is_callable('pg_connect')){ + if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')){ $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.
','hint'=>'');//TODO: sane hint } $CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" ); -- cgit v1.2.3