From 9c45ab49a152545991ec324bfdc4f41292e91bad Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 17 Mar 2015 12:14:34 +0100
Subject: Use a closure for the files app entry and deprecate old methods

---
 apps/files/appinfo/app.php | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

(limited to 'apps')

diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 87791e2558e..528156e1a28 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -1,32 +1,37 @@
 <?php
 
-$l = \OC::$server->getL10N('files');
 
-OCP\App::registerAdmin('files', 'admin');
+\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/files.svg"),
-	"name" => $l->t("Files")));
+\OC::$server->getNavigationManager()->add(function () {
+	$l = \OC::$server->getL10N('files');
+	return [
+		'id' => 'files_index',
+		'order' => 0,
+		'href' => \OCP\Util::linkTo('files', 'index.php'),
+		'icon' => \OCP\Util::imagePath('core', 'places/files.svg'),
+		'name' => $l->t('Files'),
+	];
+});
 
 \OC::$server->getSearch()->registerProvider('OC\Search\Provider\File', array('apps' => array('files')));
 
-$templateManager = OC_Helper::getFileTemplateManager();
+$templateManager = \OC_Helper::getFileTemplateManager();
 $templateManager->registerTemplate('text/html', 'core/templates/filetemplates/template.html');
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
 
-\OCA\Files\App::getNavigationManager()->add(
-	array(
-		"id" => 'files',
-		"appname" => 'files',
-		"script" => 'list.php',
-		"order" => 0,
-		"name" => $l->t('All files')
-	)
-);
+\OCA\Files\App::getNavigationManager()->add(function () {
+	$l = \OC::$server->getL10N('files');
+	return [
+		'id' => 'files',
+		'appname' => 'files',
+		'script' => 'list.php',
+		'order' => 0,
+		'name' => $l->t('All files'),
+	];
+});
 
 \OC::$server->getActivityManager()->registerExtension(function() {
 	return new \OCA\Files\Activity(
-- 
cgit v1.2.3