Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.104.2.3 -r1.104.2.4
--- openacs-4/packages/xowiki/xowiki.info	2 Feb 2009 23:33:01 -0000	1.104.2.3
+++ openacs-4/packages/xowiki/xowiki.info	11 Feb 2011 08:13:35 -0000	1.104.2.4
@@ -8,7 +8,7 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.106.3" url="http://openacs.org/repository/download/apm/xowiki-0.106.3.apm">
+    <version name="0.106.4" url="http://openacs.org/repository/download/apm/xowiki-0.106.4.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
@@ -54,7 +54,7 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.106.3"/>
+        <provides url="xowiki" version="0.106.4"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
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.77 -r1.77.2.1
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	11 Nov 2008 12:25:35 -0000	1.77
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	11 Feb 2011 08:13:35 -0000	1.77.2.1
@@ -96,6 +96,12 @@
   ::xowiki::Includelet proc js_name {name} {
     return [string map [list : _ # _] $name]
   }
+
+  ::xowiki::Includelet proc html_encode {string} {
+    # &apos; is not a known entity to some validators, so we use the
+    # numerical entity here for encoding "'"
+    return [string map [list & "&amp;" < "&lt;" > "&gt;" \" "&quot;" ' "&#39;"] $string]
+  }
   
   ::xowiki::Includelet proc html_id {name} {
     # Construct a valid HTML id or name. 
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.151.2.4 -r1.151.2.5
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	3 Feb 2009 09:56:01 -0000	1.151.2.4
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	11 Feb 2011 08:13:35 -0000	1.151.2.5
@@ -499,9 +499,10 @@
     } else {
       # the requested page was not found, provide an error message and 
       # an optional link for creating the page
-      set edit_snippet [my create_new_snippet [my set object]]
+      set path [::xowiki::Includelet html_encode [my set object]]
+      set edit_snippet [my create_new_snippet $path]
       return [my error_msg -template_file $error_template \
-		  "Page <b>'[my set object]'</b> is not available. $edit_snippet"]
+		  "Page <b>'$path'</b> is not available. $edit_snippet"]
     }
   }