[mxbb-commits] core/modules/mx_navmenu/includes navmenu_functions.php, 1.3, 1.4

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1662/modules/mx_navmenu/includes

Modified Files:
	navmenu_functions.php 
Log Message:
This navigation business is complex :/

Index: navmenu_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** navmenu_functions.php	16 Aug 2006 20:00:33 -0000	1.3
--- navmenu_functions.php	20 Aug 2006 14:21:11 -0000	1.4
***************
*** 166,169 ****
--- 166,170 ----
  	$num_of_cats = 0;
  	$navCategory = array();
+ 	$pageMapping = array();
  	for( $menu_count = 0; $menu_count < $num_of_menus; $menu_count++ )
  	{
***************
*** 173,177 ****
  		if ( $cat_id != $mx_nav_data[$menu_count]['cat_id'] )
  		{
! 			if ($mx_nav_data[$menu_count]['cat_url'] != '0')
  			{
  				$pageMapping[$mx_nav_data[$menu_count]['cat_url']] = $mx_nav_data[$menu_count]['cat_id'];
--- 174,178 ----
  		if ( $cat_id != $mx_nav_data[$menu_count]['cat_id'] )
  		{
! 			if ($mx_nav_data[$menu_count]['cat_url'] != '0' && !isset($pageMapping[$mx_nav_data[$menu_count]['cat_url']]))
  			{
  				$pageMapping[$mx_nav_data[$menu_count]['cat_url']] = $mx_nav_data[$menu_count]['cat_id'];
***************
*** 184,190 ****
  		// Menu Maps
  		//
! 		if ($mx_nav_data[$menu_count]['page_id'] != '0')
  		{
! 				$pageMapping[$mx_nav_data[$menu_count]['page_id']] = $mx_nav_data[$menu_count]['cat_id'];
  		}
  
--- 185,191 ----
  		// Menu Maps
  		//
! 		if ($mx_nav_data[$menu_count]['page_id'] != '0' && !isset($pageMapping[$mx_nav_data[$menu_count]['page_id']]))
  		{
! 			$pageMapping[$mx_nav_data[$menu_count]['page_id']] = $mx_nav_data[$menu_count]['cat_id'];
  		}