[mxbb-commits] core/modules/mx_navmenu/includes navmenu_functions.php, 1.7.2.3, 1.7.2.4

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

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

Modified Files:
      Tag: core28x
	navmenu_functions.php 
Log Message:
A few fixes, and added custom tpl file switch

Index: navmenu_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -C2 -d -r1.7.2.3 -r1.7.2.4
*** navmenu_functions.php	3 May 2008 19:11:58 -0000	1.7.2.3
--- navmenu_functions.php	8 May 2008 18:51:43 -0000	1.7.2.4
***************
*** 351,354 ****
--- 351,355 ----
  					$cat_on = $current_parent_page ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $page_data['page_id']]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $page_data['page_id']] == 1 : $catData[0]['cat_show'] == 1 );
  					$menu_sep = $first_menu ? '' : '|';
+ 					$style = $current_parent_page ? 'cattitle' : 'genmed';
  					$first_menu = false;
  
***************
*** 411,415 ****
  					$row_color_over = $theme['tr_color2'];
  
! 					$is_current = $mx_page->page_id == $page_data['page_id'];
  					$action = $page_data['page_name'];
  					$action = ( !empty($lang[$action]) ? $lang[$action] : $action );
--- 412,416 ----
  					$row_color_over = $theme['tr_color2'];
  
! 					$is_current = $mx_page->page_id == $page_data['page_id'] || has_active_subpage($page_data['page_id']);
  					$action = $page_data['page_name'];
  					$action = ( !empty($lang[$action]) ? $lang[$action] : $action );
***************
*** 452,456 ****
  					$menu_link = mx_append_sid(PORTAL_URL . 'index.php?page=' . $page_data['page_id']);
  
- 
  					$link_target = ( true ) ? '' : '_blank';
  
--- 453,456 ----