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.299 -r1.300
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 Oct 2008 07:39:35 -0000	1.299
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 Oct 2008 16:05:28 -0000	1.300
@@ -991,7 +991,7 @@
       return $page$ch2
     } else {
       # we have a direct (adp-less include)
-      set html [my include [my undoublequote $arg]]
+      set html [my include [my unescape $arg]]
       #my log "--include includelet returns $html"
       incr ::xowiki_inclusion_depth -1
       return $html$ch2
@@ -1013,20 +1013,21 @@
       return ""
     }
   }
-  Page instproc undoublequote string {
+
+  Page instproc unescape string {
     # Some browsers change {{cmd -flag "..."}} into {{cmd -flag "..."}}
     # We have to change this back
-    regsub -all {([^\\])"} $string "\\1\"" string
-    return $string
+    return [string map [list """ \" "&" & "&semicolon;" {;} ] $string]
   }
+
   Page instproc anchor {arg} {
     #my msg [self args]
     set label $arg
     set link $arg
     set options ""
     regexp {^([^|]+)[|](.*)$} $arg _ link label
     regexp {^([^|]+)[|](.*)$} $label _ label options
-    set options [my undoublequote $options]
+    set options [my unescape $options]
     if {[string match "http*//*" $link] 
         || [string match "ftp://*" $link]
         || [string match "//*" $link]
@@ -1434,6 +1435,10 @@
   PlainPage set markupmap(escape)   [list "\\\[\["  \03\01  "\\\{\{"  \03\02   {\>>}  \03\03]
   PlainPage set markupmap(unescape) [list  \03\01 "\[\["     \03\02 "\{\{"      \03\03 {>>}]
 
+  PlainPage instproc unescape string {
+    return $string
+  }
+
   PlainPage instproc get_content {} {
     set content [my set text]
     if {[my render_adp]} {set content [my adp_subst $content]}