Skip to content
Snippets Groups Projects
Commit 04c6582a authored by Frank Karlitschek's avatar Frank Karlitschek
Browse files

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

parent e1268cd5
Branches
No related tags found
No related merge requests found
...@@ -55,7 +55,7 @@ class OC_App{ ...@@ -55,7 +55,7 @@ class OC_App{
} }
// Our very own core apps are hardcoded // Our very own core apps are hardcoded
foreach( array( 'settings') as $app ){ foreach( array( 'files', 'settings') as $app ){
if(is_null($types)){ if(is_null($types)){
require( $app.'/appinfo/app.php' ); require( $app.'/appinfo/app.php' );
} }
...@@ -64,7 +64,7 @@ class OC_App{ ...@@ -64,7 +64,7 @@ class OC_App{
// The rest comes here // The rest comes here
$apps = self::getEnabledApps(); $apps = self::getEnabledApps();
foreach( $apps as $app ){ 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')){ if(is_file(OC::$APPSROOT.'/apps/'.$app.'/appinfo/app.php')){
require( $app.'/appinfo/app.php' ); require( $app.'/appinfo/app.php' );
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment