Make OC_CONFIG working again

diff --git a/lib/base.php b/lib/base.php
index 270bf09e9acface4cea858f171b0bb99bf2c0562..20ce6dcc4c45e135c6d2163318562b3cb4982a29 100644 (file)
--- 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 1b7783403ca5e80a26ea6c276bd37a2ece8e7fdb..ceea05c139b052ac50d591bbee20809483330d5c 100644 (file)
--- 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;