[evolvis-commits] r17741: [#2214] theme-evolvis pending merges:↵ Thorsten Glaser 2011-11-30 switch to more dynamic parameter passing to Navigation->getSiteMenu()

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Nov 30 16:28:27 CET 2011


Author: mirabilos
Date: 2011-11-30 16:28:27 +0100 (Wed, 30 Nov 2011)
New Revision: 17741

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
Log:
[#2214] theme-evolvis pending merges:
  Thorsten Glaser 2011-11-30 switch to more dynamic parameter passing to Navigation->getSiteMenu()


Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php	2011-11-30 15:28:20 UTC (rev 17740)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php	2011-11-30 15:28:27 UTC (rev 17741)
@@ -209,10 +209,10 @@
 	 *  number of the selected menu entry. $result['request_uri']:
 	 *  getStringFromServer('REQUEST_URI');
 	 */
-        function getSiteMenu($skipmypage=false) {
+        function getSiteMenu($menu=array()) {
                 $request_uri = getStringFromServer('REQUEST_URI');
-                
-                $menu = array();
+		$skipmypage = util_ifsetor($menu['skipmypage'], false);                
+
                 $menu['titles'] = array();
                 $menu['urls'] = array();
 		$menu['tooltips'] = array();

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-11-30 15:28:20 UTC (rev 17740)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php	2011-11-30 15:28:27 UTC (rev 17741)
@@ -141,7 +141,8 @@
 					_('New Account'),
 				    );
 			}
-			$sitemenu = $this->navigation->getSiteMenu(true);
+			$p = array('skipmypage' => true);
+			$sitemenu = $this->navigation->getSiteMenu($p);
 			$request_uri = $sitemenu['request_uri'];
 			if (strstr($request_uri, util_make_uri('/my/')) ||
 			    strstr($request_uri, util_make_uri('/account/')) ||



More information about the evolvis-commits mailing list