diff options
| author | Frank Karlitschek <frank@oc.(none)> | 2012-04-30 13:58:48 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@oc.(none)> | 2012-04-30 13:58:48 +0200 |
| commit | 04c6582af1aa8b6593afa5e302fadac52646699f (patch) | |
| tree | 9ab8ea5f27305618f3f94f251f1c515b549691bd | |
| parent | e1268cd5f4524188bdda73183b0120511887ab11 (diff) | |
| download | nextcloud-server-04c6582af1aa8b6593afa5e302fadac52646699f.tar.gz nextcloud-server-04c6582af1aa8b6593afa5e302fadac52646699f.zip | |
load the files app in a way that doesn´t break oC3 configurations
| -rw-r--r-- | lib/app.php | 4 |
1 files 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' ); } |