Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.370 -r1.371
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	16 Nov 2009 09:55:22 -0000	1.370
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	18 Nov 2009 16:19:04 -0000	1.371
@@ -2131,7 +2131,11 @@
   PageInstance instproc get_form {} {
     # get the (HTML) form of the ::xowiki::PageTemplates/::xowiki::Form
     set form [my get_from_template form]
-    if {[llength $form] == 2 && [lindex $form 1] eq "text/html"} {set form [lindex $form 0]}
+    # Check, whether we got the form through a classic 2-element openacs templating widget or directly.
+    # If the list is not wellformed, it must be contained directly.
+    if {![catch {set l [llength $form]}] 
+	&& $l == 2 
+	&& [lindex $form 1] eq "text/html"} {return [lindex $form 0]}
     return $form
   }