Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.274
diff -u -p -r1.274 menu.inc
--- includes/menu.inc	26 May 2008 17:12:54 -0000	1.274
+++ includes/menu.inc	11 Jun 2008 16:41:36 -0000
@@ -1570,9 +1570,9 @@ function menu_set_active_trail($new_trai
       }
       else {
         // Move to the child link if it's in the active trail.
-        if ($curr['below'] && $curr['link']['in_active_trail']) {
+        if ($curr['link']['in_active_trail']) {
           $trail[] = $curr['link'];
-          $tree = $curr['below'];
+          $tree = $curr['below'] ? $curr['below'] : array();
         }
         list($key, $curr) = each($tree);
       }