- Bugfix: stopped the menu system from generating empty lists (<ul></ul>). Patch

  by Nick (CodeMonkeyX).

- Bugfix: anonymous users could not change comment settings.  Patch by Bart.

- Bugfix: the comment control form always showed "order by date - newest first",
  no matter what order you selected.  Patch by Bart.

- Small usability improvement: only display comment controls when there are
  comments to show.  Patch by Bart.

1 files changed, 6 insertions, 2 deletions

diff --git a/includes/menu.inc b/includes/menu.inc
index ca2088fef..7cb17459a 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -135,7 +135,8 @@ function menu_tree($parent = "") {
   }
 
   if ($_list[$parent]["children"]) {
-    $output = "\n<ul>\n";
+    $output = "";
+
     usort($_list[$parent]["children"], "_menu_sort");
     foreach ($_list[$parent]["children"] as $item) {
       /*
@@ -153,7 +154,10 @@ function menu_tree($parent = "") {
         $output .= "</li>\n";
       }
     }
-    $output .= "</ul>\n";
+
+    if ($output != '') {
+      $output  = "\n<ul>\n$output\n</ul>\n";
+    }
   }
 
   return $output;