From 7b099c78e0efeb039739effd4c3bc2b3eae9ba29 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Tue, 16 Dec 2014 12:23:25 +0100
Subject: reuse id for navigation

---
 appinfo/info.xml     |  3 +--
 config/appconfig.php | 12 +++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index b4a82ac6b..5dcc3e034 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -21,7 +21,7 @@
 
     <!-- dependencies -->
     <dependencies>
-        <owncloud min-version="8" />
+        <owncloud min-version="7.6" />
         <php min-version="5.4" />
         <database>pgsql</database>
         <database>sqlite</database>
@@ -33,7 +33,6 @@
 
     <!-- navigation -->
     <navigation>
-        <id>news</id>
         <route>news.page.index</route>
         <order>10</order>
         <icon>app.svg</icon>
diff --git a/config/appconfig.php b/config/appconfig.php
index a206351d1..9b3f80a1d 100644
--- a/config/appconfig.php
+++ b/config/appconfig.php
@@ -99,15 +99,17 @@ class AppConfig {
             $nav =& $this->config['navigation'];
 
             $navConfig = [
-                'id' => $nav['id'],
+                'id' => $this->config['id'],
                 'order' => $nav['order'],
                 'name' => $nav['name']
             ];
 
-            $navConfig['href'] =
-                $this->urlGenerator->linkToRoute($nav['route']);
-            $navConfig['icon'] = $this->urlGenerator->imagePath($nav['id'],
-                $nav['icon']);
+            $navConfig['href'] = $this->urlGenerator->linkToRoute(
+                $nav['route']
+            );
+            $navConfig['icon'] = $this->urlGenerator->imagePath(
+                $this->config['id'], $nav['icon']
+            );
 
             $this->navigationManager->add($navConfig);
         }
-- 
cgit v1.2.3