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.56 -r1.57
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	15 Jun 2007 09:34:51 -0000	1.56
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	15 Jun 2007 13:45:06 -0000	1.57
@@ -752,8 +752,8 @@
         required {my required true}
         text     {set type text}
         date     {set type date}
-        boolean  {set type date}
-        month    {set type date}
+        boolean  {set type boolean}
+        month    {set type month}
         label=*  {my label [lindex [split $e =] 1]}
         size=*   {my size [lindex [split $e =] 1]}
       }
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.111 -r1.112
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Jun 2007 09:40:31 -0000	1.111
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Jun 2007 13:45:06 -0000	1.112
@@ -164,7 +164,7 @@
   }
   Page set recursion_count 0
   Page array set RE {
-    include {([^\\]){{([^<]+?)}}(\s|$)}
+    include {([^\\]){{([^<]+?)}}(\s|<|$)?}
     anchor  {([^\\])\\\[\\\[([^\]]+?)\\\]\\\]}
     div     {()([^\\])&gt;&gt;([^&<]*?)&lt;&lt;()([ \n]*<br */?>)?}
     clean   {[\\](\{\{|&gt;&gt;|\[\[)}
@@ -490,7 +490,7 @@
     }
   }
 
-  Page instproc include {ch arg} {
+  Page instproc include {ch arg ch2} {
     [self class] instvar recursion_depth
     if {[regexp {^adp (.*)$} $arg _ adp]} {
       if {[catch {lindex $adp 0} errMsg]} {
@@ -517,15 +517,15 @@
            adp_include returned error message: $errorMsg</div>\n"
       }
 
-      return $ch$page
+      return $ch$page$ch2
     } else {
       # we have a direct (adp-less include)
       # Some browsers change {{cmd -flag "..."}} into {{cmd -flag &quot;...&quot;}}
       # We have to change this back
       regsub -all {([^\\])&quot;}  $arg "\\1\"" arg
       set html [my include_portlet $arg]
       #my log "--include portlet returns $html"
-      return ${ch}$html
+      return $ch$html$ch2
     }
   }
 
@@ -610,7 +610,7 @@
       if {[string first \{\{ $l] > -1 && [string first \}\} $l] == -1} continue
       set l [my regsub-eval $RE(anchor)  $l {my anchor  "\1" "\2"}]
       set l [my regsub-eval $RE(div)     $l {my div     "\2" "\3"}]
-      set l [my regsub-eval $RE(include) $l {my include "\1" "\2"}]
+      set l [my regsub-eval $RE(include) $l {my include "\1" "\2" "\3"}]
       regsub -all $RE(clean) $l {\1} l
       regsub -all $RE(clean2) $l { \1} l
       append content [string range $l 1 end] \n
@@ -791,7 +791,7 @@
       set l " $l"
       set l [my regsub-eval $RE(anchor)  $l {my anchor  "\1" "\2"}]
       set l [my regsub-eval $RE(div)     $l {my div     "\2" "\3"}]
-      set l [my regsub-eval $RE(include) $l {my include "\1" "\2"}]
+      set l [my regsub-eval $RE(include) $l {my include "\1" "\2" ""}]
       regsub -all $RE(clean) $l {\1} l
       append content [string range $l 1 end] \n
     }