summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2012-05-02 11:26:22 +0200
committerArthur Schiwon <blizzz@owncloud.com>2012-05-02 11:26:22 +0200
commit67509989845ea422c4d96ebd704fbf5981eb5e8f (patch)
tree23bbd27550dddbdb355f0019807cb31a8f604fa2 /lib
parentd71600213a71be5710d47add24d57250e6427865 (diff)
downloadnextcloud-server-67509989845ea422c4d96ebd704fbf5981eb5e8f.tar.gz
nextcloud-server-67509989845ea422c4d96ebd704fbf5981eb5e8f.zip
files is not internal any more, part II
Diffstat (limited to 'lib')
-rw-r--r--lib/app.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/app.php b/lib/app.php
index 3194802eae4..2917fd7a572 100644
--- a/lib/app.php
+++ b/lib/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)) and $app<>'files'){
+ if((is_null($types) or self::isType($app,$types))){
if(is_file(OC::$APPSROOT.'/apps/'.$app.'/appinfo/app.php')){
require( $app.'/appinfo/app.php' );
}
@@ -421,7 +421,6 @@ class OC_App{
$source=self::$settingsForms;
break;
case 'admin':
- $forms[] = include 'files/admin.php'; //hardcode own apps
$source=self::$adminForms;
break;
case 'personal':