[mxbb-commits] core/modules/mx_navmenu mx_menu_nav.php, 1.22.2.1, 1.22.2.2 mx_site_nav.php, 1.1.2.1, 1.1.2.2

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

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

Modified Files:
      Tag: core28x
	mx_menu_nav.php mx_site_nav.php 
Log Message:
Output duplicated template parameters, for compatibility with 2.9.x.

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -d -r1.22.2.1 -r1.22.2.2
*** mx_menu_nav.php	3 Feb 2008 19:25:02 -0000	1.22.2.1
--- mx_menu_nav.php	27 Apr 2008 18:45:28 -0000	1.22.2.2
***************
*** 204,207 ****
--- 204,208 ----
  	//
  	$cat_on = $current_cat || $hasCurrentMenu ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 );
+ 	$style = $catData[0]['cat_url'] == $page_id && !$hasCurrentMenu ? 'cattitle' : 'genmed';
  
  	$template->assign_block_vars('catrow', array(
***************
*** 209,215 ****
  		'BLOCK_ID'				=> intval($block_id),
  		'CATEGORY'				=> $catt,
- 		'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'],
--- 210,217 ----
  		'BLOCK_ID'				=> intval($block_id),
  		'CATEGORY'				=> $catt,
  		'CATEGORY_NAME'			=> $cat,
! 		'CATEGORY_STYLE'		=> $style,
! 		'CATEGORY_URL'			=> $cat_url,
! 		'U_CATEGORY_URL'		=> $cat_url, // For compatibility with 2.9.x+
  		'U_CAT_NAV_CONTRACT' 	=> $images['mx_contract'],
  		'U_CAT_NAV_EXPAND' 		=> $images['mx_expand'],
***************
*** 219,222 ****
--- 221,233 ----
  	));
  
+ 	if ( $catData[0]['cat_url'] != 0 )
+ 	{
+ 		$template->assign_block_vars('catrow.menurow_cat', array(
+ 			'CATEGORY_NAME'			=> $cat,
+ 			'U_CATEGORY_URL'		=> $cat_url,
+ 			'CATEGORY_STYLE'		=> $style,
+ 		));
+ 	}
+ 
  	if (!empty($cat_desc))
  	{
***************
*** 229,232 ****
--- 240,244 ----
  	// Loop through each menu in this category
  	//
+ 	$first_menu = true;
  	foreach($catData as $key => $menuData)
  	{
***************
*** 241,244 ****
--- 253,259 ----
  		}
  
+ 		$menu_sep = $first_menu ? '' : '|';
+ 		$first_menu = false;
+ 
  		$action = $menuData['menu_name'];
  		$action = ( !empty($lang[$action]) ? $lang[$action] : $action );
***************
*** 316,329 ****
  			'MENU_STYLE'		=> $style,
  			'MENU_DESC'			=> $desc,
  			'U_MENU_MODULE'		=> $menu_link,
  			'U_LINK_TARGET'		=> $link_target,
! 			'U_MENU_ICON'		=> $menu_icon
  		);
  
  		$template->assign_block_vars('catrow.modulerow', $menu_array);
  
  		if ($current_cat)
  		{
  			$template->assign_block_vars('modulerow', $menu_array);
  		}
  	}
--- 331,354 ----
  			'MENU_STYLE'		=> $style,
  			'MENU_DESC'			=> $desc,
+ 			'MENU_SEP'			=> $menu_sep,
+ 
  			'U_MENU_MODULE'		=> $menu_link,
  			'U_LINK_TARGET'		=> $link_target,
! 			'U_MENU_ICON'		=> $menu_icon,
! 
! 			// For compatibility with 2.9.x+
! 			'U_MENU_URL'		=> $menu_link,
! 			'U_MENU_URL_TARGET'	=> $link_target,
! 			'MENU_ICON'			=> $icon_url,
! 			'CURRENT' 			=> $menuData['is_current'] ? '-current' : '',
  		);
  
  		$template->assign_block_vars('catrow.modulerow', $menu_array);
+ 		$template->assign_block_vars('catrow.menurow', $menu_array); // For compatibility with 2.9.x+
  
  		if ($current_cat)
  		{
  			$template->assign_block_vars('modulerow', $menu_array);
+ 			$template->assign_block_vars('menurow', $menu_array); // For compatibility with 2.9.x+
  		}
  	}
***************
*** 340,343 ****
--- 365,374 ----
  	'CAT_WIDTH'				=> $cat_width,
  
+ 	//+ mxBB
+ 	'U_PORTAL_ROOT_PATH' 	=> PORTAL_URL,
+ 	'U_PHPBB_ROOT_PATH' 	=> PHPBB_URL,
+ 	'TEMPLATE_ROOT_PATH'	=> TEMPLATE_ROOT_PATH,
+ 	'TEMPLATE_IMAGES_PATH'	=> $images['mx_menu_images'], // Full path
+ 
  	//
  	// mygosmenu

Index: mx_site_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** mx_site_nav.php	3 Feb 2008 19:25:03 -0000	1.1.2.1
--- mx_site_nav.php	27 Apr 2008 18:45:29 -0000	1.1.2.2
***************
*** 112,115 ****
--- 112,120 ----
  	'CAT_WIDTH'				=> $cat_width,
  
+ 	//+ mxBB
+ 	'U_PORTAL_ROOT_PATH' 	=> PORTAL_URL,
+ 	'U_PHPBB_ROOT_PATH' 	=> PHPBB_URL,
+ 	'TEMPLATE_ROOT_PATH'	=> TEMPLATE_ROOT_PATH,
+ 
  	//
  	// mygosmenu