Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.55 -r1.56
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	27 Sep 2008 17:27:56 -0000	1.55
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	1 Oct 2008 13:48:54 -0000	1.56
@@ -89,6 +89,10 @@
     return $result
   }
 
+  ::xowiki::Includelet proc html_to_text {string} {
+    return [string map [list "&" &] $string]
+  }
+
   ::xowiki::Includelet proc js_name {name} {
     return [string map [list : _ # _] $name]
   }
@@ -2813,11 +2817,13 @@
     set init_vars [list]
     array set uc {tcl false h "" vars "" sql ""}
     if {[info exists unless]} {
+      set unless [::xowiki::Includelet html_to_text $unless]
       array set uc [::xowiki::FormPage filter_expression $unless ||]
       set init_vars [concat $init_vars $uc(vars)]
     }
     array set wc {tcl true h "" vars "" sql ""}
     if {[info exists where]} {
+      set where [::xowiki::Includelet html_to_text $where]
       array set wc [::xowiki::FormPage filter_expression $where &&]
       set init_vars [concat $init_vars $wc(vars)]
     }