From fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sun, 07 Jun 2015 12:16:19 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/nav.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/nav.php b/interface/web/nav.php
index 6475daa..773f7d1 100644
--- a/interface/web/nav.php
+++ b/interface/web/nav.php
@@ -74,7 +74,7 @@
 					$language = (isset($_SESSION['s']['user']['language']))?$_SESSION['s']['user']['language']:$conf['language'];
 					$app->load_language_file('web/'.$mt.'/lib/'.$language.'.lng');
 					$active = ($module['name'] == $_SESSION['s']['module']['name']) ? 1 : 0;
-					$topnav[$module['order']] = array( 'title'  => $app->lng($module['title']),
+					$topnav[$module['order'].'-'.$module['name']] = array( 'title'  => $app->lng($module['title']),
 						'active'  => $active,
 						'module' => $module['name']);
 				}

--
Gitblit v1.9.1