load the files app in a way that doesn´t break oC3 configurations

diff --git a/lib/app.php b/lib/app.php
index ed7bd6ff3f99ea154edd7a2093d5b5068dd578aa..034403d1d5aa0b6d9785cab0f68dc449f33ef316 100644 (file)
--- a/lib/app.php
+++ b/lib/app.php
@@ -55,7 +55,7 @@ class OC_App{
                }
 
                // Our very own core apps are hardcoded
-               foreach( array( 'settings') as $app ){
+               foreach( array( 'files', 'settings') as $app ){
                        if(is_null($types)){
                                require( $app.'/appinfo/app.php' );
                        }
@@ -64,7 +64,7 @@ class OC_App{
                // The rest comes here
                $apps = self::getEnabledApps();
                foreach( $apps as $app ){
-                       if(is_null($types) or self::isType($app,$types)){
+                       if((is_null($types) or self::isType($app,$types)) and $app<>'files'){
                                if(is_file(OC::$APPSROOT.'/apps/'.$app.'/appinfo/app.php')){
                                        require( $app.'/appinfo/app.php' );
                                }