Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.25.2.1 -r1.25.2.2
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	13 Feb 2007 08:24:55 -0000	1.25.2.1
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	6 Jun 2007 18:35:20 -0000	1.25.2.2
@@ -553,7 +553,10 @@
     "\[template::form check_elements $id\]"
   }
 
-  template::adp_append_string "</fieldset></form>"
+  if { [info exists form_properties(fieldset)] } {
+      template::adp_append_string "</fieldset>"
+  }
+  template::adp_append_string "</form>"
 }