From 67509989845ea422c4d96ebd704fbf5981eb5e8f Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 2 May 2012 11:26:22 +0200 Subject: [PATCH] files is not internal any more, part II --- apps/files/appinfo/app.php | 1 + lib/app.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index 4a05a655957..355b77d5e7e 100755 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -4,6 +4,7 @@ $l=OC_L10N::get('files'); OCP\App::register( array( "order" => 2, "id" => "files", "name" => "Files" )); +OCP\App::registerAdmin('files','admin'); OCP\App::addNavigationEntry( array( "id" => "files_index", "order" => 0, "href" => OCP\Util::linkTo( "files", "index.php" ), "icon" => OCP\Util::imagePath( "core", "places/home.svg" ), "name" => $l->t("Files") )); 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': -- 2.39.5