From b889edb33e4a09cc1f65d2fb9ad9f9ea16b1eae9 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 04 Sep 2012 11:42:42 -0400
Subject: [PATCH] - Ported changes from Apache plugin to nginx plugin. - Fixed errors in system.inc.php-

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

diff --git a/interface/web/nav.php b/interface/web/nav.php
index 0c57adb..909392f 100644
--- a/interface/web/nav.php
+++ b/interface/web/nav.php
@@ -45,6 +45,7 @@
 		/*
 		 * If the dashboard is in the list of modules it always has to be the first!
 		 */
+		asort($modules);
 		if (in_array('dashboard', $modules)) {
 			$key = array_search('dashboard', $modules);
 			unset($modules[$key]);
@@ -55,6 +56,8 @@
 				if(is_file($mt.'/lib/module.conf.php')) {
 					if(!preg_match("/^[a-z]{2,20}$/i", $mt)) die('module name contains unallowed chars.');
 					include_once($mt.'/lib/module.conf.php');
+					$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[] = array(	'title' 	=> $app->lng($module['title']),
 							'active' 	=> $active,

--
Gitblit v1.9.1