From: Jakob Sack <kde@jakobsack.de>
Date: Sat, 16 Apr 2011 09:25:21 +0000 (+0200)
Subject: Make OC_CONFIG working again
X-Git-Tag: v3.0~267^2~558^2~150
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=177fd27382ca425594037389ada6f7fa3392ba04;p=nextcloud-server.git

Make OC_CONFIG working again
---

diff --git a/lib/base.php b/lib/base.php
index 270bf09e9ac..20ce6dcc4c4 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -56,14 +56,11 @@ if( !isset( $RUNTIME_NOAPPS )){
 }
 
 // define default config values
-$CONFIG_INSTALLED=false;
 $CONFIG_DATADIRECTORY=$SERVERROOT.'/data';
 $CONFIG_BACKUPDIRECTORY=$SERVERROOT.'/backup';
 $CONFIG_HTTPFORCESSL=false;
 $CONFIG_ENABLEBACKUP=false;
 $CONFIG_DATEFORMAT='j M Y G:i';
-$CONFIG_DBNAME='owncloud';
-$CONFIG_DBTYPE='sqlite';
 $CONFIG_FILESYSTEM=array();
 
 // include the generated configfile
diff --git a/lib/config.php b/lib/config.php
index 1b7783403ca..ceea05c139b 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -126,8 +126,8 @@ class OC_CONFIG{
 	 *
 	 * Reads the config file and saves it to the cache
 	 */
-	private static function readData( $key ){
-		if( !self::$init ){
+	private static function readData(){
+		if( self::$init ){
 			return true;
 		}
 
@@ -155,7 +155,7 @@ class OC_CONFIG{
 	 *
 	 * Known flaws: Strings are not escaped properly
 	 */
-	public static function writeData( $key ){
+	public static function writeData(){
 		// We need the serverroot path
 		global $SERVERROOT;