1) Revert the changes to Form_Upload and Form_Textarea, so we don't have to change third party code.

2) Change drawForm to check for a non empty $input->class in order to determime if the element should be wrapped in <li>...</li>.  If $input->class is empty then treat as a hidden field.

1 files changed, 3 insertions, 3 deletions

diff --git a/themes/default/views/form.html.php b/themes/default/views/form.html.php
index 41bdc0f9..6d527aed 100644
--- a/themes/default/views/form.html.php
+++ b/themes/default/views/form.html.php
@@ -27,10 +27,10 @@ if (!function_exists("DrawForm")) {
       } else {
         if ($input->error_messages()) {
           print "$prefix<li class=\"gError\">\n";
-        } else if ($input->type) {
+        } else if ($input->class) {
           print "$prefix<li>\n";
         } else {
-          // no type means its a "hidden" so don't wrap it in <li>
+          // no class means its a "hidden" so don't wrap it in <li>
         }
         if ($input->label()) {
           print "$prefix  {$input->label()}\n";
@@ -46,7 +46,7 @@ if (!function_exists("DrawForm")) {
             print "$prefix  </p>\n";
           }
         }
-        if ($input->type) {
+        if ($input->class) {
           print "$prefix</li>\n";
         }
       }