summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/menu.inc4
-rw-r--r--includes/theme.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index 12c4132e4..55bece1f3 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -137,13 +137,13 @@ function menu_in_active_trail($path) {
function menu_tree($parent = "", $hidden = 0) {
global $_list;
static $trail;
+ $output = "";
if (empty($trail)) {
$trail = menu_get_trail($_GET["q"]);
}
- if ($_list[$parent]["children"]) {
- $output = "";
+ if (isset($_list[$parent]) && $_list[$parent]["children"]) {
usort($_list[$parent]["children"], "_menu_sort");
foreach ($_list[$parent]["children"] as $item) {
diff --git a/includes/theme.inc b/includes/theme.inc
index cbd632475..0a9fb1074 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -403,7 +403,7 @@ function theme_mark() {
@return a string containing the \a list output.
**/
function theme_item_list($items = array(), $title = NULL) {
- $output .= "<div class=\"item-list\">";
+ $output = "<div class=\"item-list\">";
if (isset($title)) {
$output .= "<h3>$title</h3>";
}