1 files changed, 14 insertions, 3 deletions
diff --git a/core/views/form.html.php b/core/views/form.html.php
index 8c0e31e0..ec2a56a9 100644
--- a/core/views/form.html.php
+++ b/core/views/form.html.php
@@ -14,11 +14,19 @@ if (!function_exists("DrawForm")) {
   function DrawForm($inputs, $level=1) {
     $error_messages = array();
     $prefix = str_repeat("  ", $level);
+    $haveGroup = false;
+    // On the first level, make sure we have a group if not add the <ul> tag now
+    if ($level == 1) {
+      foreach ($inputs as $input) {
+        $haveGroup |= $input->type == 'group';
+      }
+      if (!$haveGroup) {
+        print "$prefix<ul>\n";
+      }
+    }
 
     foreach ($inputs as $input) {
-      if ($input->type == 'hidden') {
-        print $input->render();
-      } else if ($input->type == 'group') {
+      if ($input->type == 'group') {
         print "$prefix<fieldset>\n";
         print "$prefix  <legend>{$input->label}</legend>\n";
         print "$prefix  <ul>\n";
@@ -56,6 +64,9 @@ if (!function_exists("DrawForm")) {
         print "$prefix</li>\n";
       }
     }
+    if ($level == 1 && !$haveGroup) {
+      print "$prefix</ul>\n";
+    }
   }
 }
 DrawForm($inputs);