From d45bf0f1e7614e961ed45d85a99e126def3edf64 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 4 Dec 2003 20:53:19 +0000
Subject: - Patch 185 by Ax: fixed undefined variables, synchronized xtemplate
 with sf, etc.

---
 includes/menu.inc  | 4 ++--
 includes/theme.inc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'includes')

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>";
   }
-- 
cgit v1.2.3