summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2008-06-24 21:29:47 (GMT)
committerDries Buytaert2008-06-24 21:29:47 (GMT)
commit22c0a0a4b0d9be19ee1444f86135998145a8d682 (patch)
treedbcd0791d25d0db012db537b1d205a606d3d9eb2
parent45ef7ac58121b6f80334daa3499299531c1bf067 (diff)
- Patch #170309 by pwolanin, Pasqualle, Nick Urban, naquah, keith.smith, et al: breadcrumb doesn'tt always include all active items.
-rw-r--r--includes/menu.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index 9619b3e..21067cd 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1574,10 +1574,10 @@ function menu_set_active_trail($new_trail = NULL) {
$curr = FALSE;
}
else {
- // Move to the child link if it's in the active trail.
- if ($curr['below'] && $curr['link']['in_active_trail']) {
+ // Add the link if it's in the active trail, then move to the link below.
+ if ($curr['link']['in_active_trail']) {
$trail[] = $curr['link'];
- $tree = $curr['below'];
+ $tree = $curr['below'] ? $curr['below'] : array();
}
list($key, $curr) = each($tree);
}