sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

remotes/origin/stable4
Frank Karlitschek 2012-04-30 13:58:48 +07:00
parent e1268cd5f4
commit 04c6582af1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/app.php
Unescape Escape View File

@ -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' );
}