[Fusionforge-commits] r16375 - trunk/src/common/include

Franck VILLAUME nerville at fusionforge.org
Sun Sep 30 11:05:31 CEST 2012


Author: nerville
Date: 2012-09-30 11:05:30 +0200 (Sun, 30 Sep 2012)
New Revision: 16375

Modified:
   trunk/src/common/include/Navigation.class.php
Log:
fix hookParams : no adminurls here; remove useless var

Modified: trunk/src/common/include/Navigation.class.php
===================================================================
--- trunk/src/common/include/Navigation.class.php	2012-09-30 09:02:52 UTC (rev 16374)
+++ trunk/src/common/include/Navigation.class.php	2012-09-30 09:05:30 UTC (rev 16375)
@@ -4,6 +4,7 @@
  *
  * Copyright 2009 - 2010, Olaf Lenz
  * Copyright 2011, Franck Villaume - TrivialDev
+ * Copyright 2012, Franck Villaume - TrivialDev
  *
  * This file is part of FusionForge. FusionForge is free software;
  * you can redistribute it and/or modify it under the terms of the
@@ -275,7 +276,6 @@
 		$before = count($menu['urls']);
 		$plugin_urls = array();
 		$hookParams['DIRS'] = &$menu['urls'];
-		$hookParams['ADMIN'] =& $menu['adminurls'];
 		$hookParams['TITLES'] = &$menu['titles'];
 		$hookParams['TOOLTIPS'] = &$menu['tooltips'];
 		plugin_hook("outermenu", $hookParams);
@@ -291,7 +291,6 @@
 
 		// Admin and Reporting
 		if (forge_check_global_perm('forge_admin')) {
-			$user_is_super = true;
 			$menu['titles'][] = _('Site Admin');
 			$menu['urls'][] = util_make_uri('/admin/');
 			$menu['tooltips'][] = _('Administration Submenu to handle global configuration, users & projects.');
@@ -299,7 +298,7 @@
 				$selected = count($menu['urls'])-1;
 			}
 		}
-		if (forge_check_global_perm ('forge_stats', 'read')) {
+		if (forge_check_global_perm('forge_stats', 'read')) {
 			$menu['titles'][] = _('Reporting');
 			$menu['urls'][] = util_make_uri('/reporting/');
 			$menu['tooltips'][] = _('Statistics about visits, users & projects in time frame.');




More information about the Fusionforge-commits mailing list