diff --git a/superfish.module b/superfish.module index 9bf96ba..6085418 100644 --- a/superfish.module +++ b/superfish.module @@ -862,6 +862,7 @@ function theme_superfish_build($variables) { // Reckon the total number of available menu items. foreach ($menu as $menu_item) { + if (!isset($menu_item['link']['hidden']) || $menu_item['link']['hidden'] == 0) { $total_children++; } @@ -872,7 +873,12 @@ function theme_superfish_build($variables) { $show_children = $megamenu_wrapper = $megamenu_column = $megamenu_content = FALSE; $item_class = $link_options = $link_class = array(); $mlid = $menu_item['link']['mlid']; - + $lang = $menu_item['link']['language']; + + if($lang) { + global $language; + if(($language->language!=$lang) && ($lang!='und')) continue; + } if (!isset($menu_item['link']['hidden']) || $menu_item['link']['hidden'] == 0) { $item_class[] = ($trail && in_array($mlid, $trail)) ? 'active-trail' : ''; @@ -1001,25 +1007,24 @@ function theme_superfish_build($variables) { $link_class = array_merge($link_class_current, array_filter($link_class)); } $menu_item['link']['localized_options']['attributes']['class'] = $link_class; - - $link_options['attributes'] = $menu_item['link']['localized_options']['attributes']; - - // Render the menu item. - $output['content'] .= '' : ''; - $output['content'] .= ($megamenu_column) ? '' : ''; - $output['content'] .= ''; + $link_options['attributes'] = $menu_item['link']['localized_options']['attributes']; + + // Render the menu item. + $output['content'] .= '' : ''; + $output['content'] .= ($megamenu_column) ? '' : ''; + $output['content'] .= ''; } } $output['total_children'] = $total_children;