Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -r1.46 -r1.47
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	18 May 2007 22:07:19 -0000	1.46
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	25 May 2007 07:56:29 -0000	1.47
@@ -628,12 +628,12 @@
             }}
             {html {rows 10 cols 50 style {width: 100%}}}}
         }
-        {validate
+        {validate {
           {{name {\[::xowiki::validate_name\]} {Another item with this name exists \
                 already in this folder}}}
           {{text {\[::xowiki::validate_form_text\]} {From must contain a template}}}
           {{form {\[::xowiki::validate_form_form\]} {From must contain an HTML form}}}
-        }
+        }}
     }
 
   FormForm instproc new_data {} {
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 -r1.102 -r1.103
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	18 May 2007 22:07:19 -0000	1.102
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	25 May 2007 07:56:29 -0000	1.103
@@ -159,7 +159,7 @@
   }
   Page set recursion_count 0
   Page array set RE {
-    include {([^\\]){{([^<]+?)}}[ \n\r]*}
+    include {([^\\]){{([^<]+?)}}\s}
     anchor  {([^\\])\\\[\\\[([^\]]+?)\\\]\\\]}
     div     {()([^\\])&gt;&gt;([^&<]*?)&lt;&lt;()([ \n]*<br */?>)?}
     clean   {[\\](\{\{|&gt;&gt;|\[\[)}