1) Create a Theme_View class that combines the functionality of the Theme class with the View class.

2) Only define the form.html.php::DrawForm method once if there are multiple forms on the page (i.e. comments and add tags)

1 files changed, 36 insertions, 34 deletions

diff --git a/themes/default/views/form.html.php b/themes/default/views/form.html.php
index 1873c53e..41bdc0f9 100644
--- a/themes/default/views/form.html.php
+++ b/themes/default/views/form.html.php
@@ -10,43 +10,45 @@ if ($title) {
   print "<!-- unused title in form.html.php: $title -->";
 }
 
-function DrawForm($inputs, $level=1) {
-  $error_messages = array();
-  $prefix = str_repeat("  ", $level);
+if (!function_exists("DrawForm")) {
+  function DrawForm($inputs, $level=1) {
+    $error_messages = array();
+    $prefix = str_repeat("  ", $level);
 
-  foreach ($inputs as $input) {
-    if ($input->type == 'group') {
-      print "$prefix<fieldset>\n";
-      print "$prefix  <legend>$input->name</legend>\n";
-      print "$prefix  <ul>\n";
-      DrawForm($input->inputs, $level + 2);
-      DrawForm($input->hidden, $level + 2);
-      print "$prefix  </ul>\n";
-      print "$prefix</fieldset>\n";
-    } else {
-      if ($input->error_messages()) {
-        print "$prefix<li class=\"gError\">\n";
-      } else if ($input->type) {
-        print "$prefix<li>\n";
+    foreach ($inputs as $input) {
+      if ($input->type == 'group') {
+        print "$prefix<fieldset>\n";
+        print "$prefix  <legend>$input->name</legend>\n";
+        print "$prefix  <ul>\n";
+        DrawForm($input->inputs, $level + 2);
+        DrawForm($input->hidden, $level + 2);
+        print "$prefix  </ul>\n";
+        print "$prefix</fieldset>\n";
       } else {
-        // no type means its a "hidden" so don't wrap it in <li>
-      }
-      if ($input->label()) {
-        print "$prefix  {$input->label()}\n";
-      }
-      print "$prefix  {$input->render()}\n";
-      if ($input->message()) {
-        print "$prefix  <p>{$input->message()}</p>\n";
-      }
-      if ($input->error_messages()) {
-        foreach ($input->error_messages() as $error_message) {
-          print "$prefix  <p class=\"gError\">\n";
-          print "$prefix    $error_message\n";
-          print "$prefix  </p>\n";
+        if ($input->error_messages()) {
+          print "$prefix<li class=\"gError\">\n";
+        } else if ($input->type) {
+          print "$prefix<li>\n";
+        } else {
+          // no type means its a "hidden" so don't wrap it in <li>
+        }
+        if ($input->label()) {
+          print "$prefix  {$input->label()}\n";
+        }
+        print "$prefix  {$input->render()}\n";
+        if ($input->message()) {
+          print "$prefix  <p>{$input->message()}</p>\n";
+        }
+        if ($input->error_messages()) {
+          foreach ($input->error_messages() as $error_message) {
+            print "$prefix  <p class=\"gError\">\n";
+            print "$prefix    $error_message\n";
+            print "$prefix  </p>\n";
+          }
+        }
+        if ($input->type) {
+          print "$prefix</li>\n";
         }
-      }
-      if ($input->type) {
-        print "$prefix</li>\n";
       }
     }
   }