From 04c6582af1aa8b6593afa5e302fadac52646699f Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@oc.(none)>
Date: Mon, 30 Apr 2012 13:58:48 +0200
Subject: [PATCH] =?utf8?q?load=20the=20files=20app=20in=20a=20way=20that?=
 =?utf8?q?=20doesn=C2=B4t=20break=20oC3=20configurations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/app.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index ed7bd6ff3f9..034403d1d5a 100644
--- 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' );
 				}
-- 
2.39.5