diff options
author | Frank Karlitschek <frank@dev.(none)> | 2010-04-14 16:58:52 +0200 |
---|---|---|
committer | Frank Karlitschek <frank@dev.(none)> | 2010-04-14 16:58:52 +0200 |
commit | 7adbbfe05cfbbfad08e2ece6e8b7150bbe2514ca (patch) | |
tree | da5fda588b5883a29e09c9bd91871d752c7926c9 /inc/lib_base.php | |
parent | c69eab18d25fb685705a7bc20117f2f042fe7981 (diff) | |
download | nextcloud-server-7adbbfe05cfbbfad08e2ece6e8b7150bbe2514ca.tar.gz nextcloud-server-7adbbfe05cfbbfad08e2ece6e8b7150bbe2514ca.zip |
add Open Collaboration API support. You can now connect your ownCloud with the KDE Social Desktop and push notifications to your Social News Plasmoid. This requires KDE trunk or KDE SV 4.5
Diffstat (limited to 'inc/lib_base.php')
-rwxr-xr-x | inc/lib_base.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/lib_base.php b/inc/lib_base.php index c38ef4b1fcf..8c0c1ca606e 100755 --- a/inc/lib_base.php +++ b/inc/lib_base.php @@ -47,7 +47,6 @@ $CONFIG_HTTPFORCESSL=false; $CONFIG_DATEFORMAT='j M Y G:i'; $CONFIG_DBNAME='owncloud'; $CONFIG_DBTYPE='sqlite'; - // include the generated configfile @include_once('config.php'); @@ -64,6 +63,7 @@ if(isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL){ require_once('lib_files.php'); require_once('lib_log.php'); require_once('lib_config.php'); +require_once('lib_ocs.php'); // load plugins $CONFIG_LOADPLUGINS='music'; @@ -257,7 +257,7 @@ class OC_DB { if($CONFIG_DBTYPE=='sqlite'){ $DBConnection = @new SQLiteDatabase($DOCUMENTROOT.'/'.$CONFIG_DBNAME); }elseif($CONFIG_DBTYPE=='mysql'){ - $DBConnection = @new mysqli($CONFIG_DBHOST, $CONFIG_DBUSER, $CONFIG_DBPASSWORD,$CONFIG_DBNAME); + $DBConnection =@new mysqli($CONFIG_DBHOST, $CONFIG_DBUSER, $CONFIG_DBPASSWORD,$CONFIG_DBNAME); } if (!$DBConnection) { @ob_end_clean(); |