### Eclipse Workspace Patch 1.0 #P netmusic Index: sites/all/modules/slicedbook_navigation/slicedbook_navigation.module =================================================================== RCS file: /cvsroot/netmusic/sites/all/modules/slicedbook_navigation/slicedbook_navigation.module,v retrieving revision 1.1 diff -u -r1.1 slicedbook_navigation.module --- sites/all/modules/slicedbook_navigation/slicedbook_navigation.module 7 Dec 2008 11:16:46 -0000 1.1 +++ sites/all/modules/slicedbook_navigation/slicedbook_navigation.module 7 Dec 2008 11:28:47 -0000 @@ -190,7 +190,7 @@ for ($i = 0; $i <= $book_depth; $i++) { if ($delta == $i) { $block['subject'] = ""; - $block['content'] = slicedbook_navigation_generate_level($active_book_id, $i, $book_tree, $active_book_branche, $depth); + $block['content'] = theme('slicedbook_navigation_generate_level', $active_book_id, $i, $book_tree, $active_book_branche, $depth); return $block; } } @@ -409,7 +409,7 @@ /** * */ -function slicedbook_navigation_generate_level($active_book_id, $depth, $book_tree, $branche) { +function theme_slicedbook_navigation_generate_level($active_book_id, $depth, $book_tree, $branche) { $subclasses = array(); $subclasses = slicedbook_navigation_get_subclasses(); $class = ""; @@ -448,11 +448,11 @@ } else { foreach ($branche as $nid) { - if (!isset($GLOBALS['slicedbook_navigation_generate_level'][$first_nid][$nid])) { - $GLOBALS['slicedbook_navigation_generate_level'][$first_nid][$nid] = array(); - $GLOBALS['slicedbook_navigation_generate_level'][$first_nid][$nid] = slicedbook_navigation_get_flat($nid, $book_tree); + if (!isset($GLOBALS['theme_slicedbook_navigation_generate_level'][$first_nid][$nid])) { + $GLOBALS['theme_slicedbook_navigation_generate_level'][$first_nid][$nid] = array(); + $GLOBALS['theme_slicedbook_navigation_generate_level'][$first_nid][$nid] = slicedbook_navigation_get_flat($nid, $book_tree); } - $flat = $GLOBALS['slicedbook_navigation_generate_level'][$first_nid][$nid]; + $flat = $GLOBALS['theme_slicedbook_navigation_generate_level'][$first_nid][$nid]; if ($link->depth == $depth && in_array($link->nid, $flat)) { $book_sub_menu .= "
  • path) ."' >". $link->title ."
  • "; }