files is not internal any more, part II

diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 4a05a655957e5008feb1fb5d28a27ca37cff8e54..355b77d5e7e3beeb9a2886c5fea9f9c10be780e5 100755 (executable)
--- 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 3194802eae4feb4179fa707ba19247b89e39e5dd..2917fd7a572a775f026428ff24c6aa284fcb9fe3 100644 (file)
--- 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':