[mxbb-commits] core/modules/mx_navmenu mx_menu_nav.php,1.13,1.14

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

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

Modified Files:
	mx_menu_nav.php 
Log Message:
A couple of PHP warnings solved

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mx_menu_nav.php	16 Aug 2006 14:47:50 -0000	1.13
--- mx_menu_nav.php	16 Aug 2006 20:00:33 -0000	1.14
***************
*** 157,166 ****
  	// For overall_header navigation
  	// - is this current page category?
! 	 $current_cat = ($pageMapping[$mx_page->page_id] == $cat_id || intval($HTTP_GET_VARS['cat_link']) == $cat_id) ? true : false;
  
  	//
  	// Update cookie - if this was a cat link
  	//
! 	if (isset($HTTP_GET_VARS['cat_link']) && intval($HTTP_GET_VARS['cat_link']) == $cat_id || $current_cat)
  	{
  		setcookie('mxNavCat_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
--- 157,166 ----
  	// For overall_header navigation
  	// - is this current page category?
! 	$current_cat = ($pageMapping[$mx_page->page_id] == $cat_id || ( isset($HTTP_GET_VARS['cat_link']) ? intval($HTTP_GET_VARS['cat_link']) == $cat_id : false) ) ? true : false;
  
  	//
  	// Update cookie - if this was a cat link
  	//
! 	if ( (isset($HTTP_GET_VARS['cat_link']) ? intval($HTTP_GET_VARS['cat_link']) == $cat_id : false) || $current_cat)
  	{
  		setcookie('mxNavCat_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
***************
*** 179,183 ****
  		'CATEGORY_URL'			=> $cat_url,
  		'CATEGORY_NAME'			=> $cat,
! 		'U_CAT_ICON'			=> $cat_icon,
  		'U_CAT_NAV_CONTRACT' 	=> $images['mx_contract'],
  		'U_CAT_NAV_EXPAND' 		=> $images['mx_expand'],
--- 179,183 ----
  		'CATEGORY_URL'			=> $cat_url,
  		'CATEGORY_NAME'			=> $cat,
! 		//'U_CAT_ICON'			=> $cat_icon,
  		'U_CAT_NAV_CONTRACT' 	=> $images['mx_contract'],
  		'U_CAT_NAV_EXPAND' 		=> $images['mx_expand'],
***************
*** 217,221 ****
  		if ( $menu_page_sync )
  		{
! 			if ( $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] )
  			{
  				$style = 'cattitle';
--- 217,221 ----
  		if ( $menu_page_sync )
  		{
! 			if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false )
  			{
  				$style = 'cattitle';
***************
*** 249,252 ****
--- 249,253 ----
  		{
  			$icon_url = $icon_tmp;
+ 			$icon_style = '';
  		}