Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.143 -r1.144
--- openacs-4/packages/xowiki/xowiki.info	11 Aug 2011 13:07:32 -0000	1.143
+++ openacs-4/packages/xowiki/xowiki.info	22 Mar 2012 10:42:55 -0000	1.144
@@ -10,10 +10,10 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.143" url="http://openacs.org/repository/download/apm/xowiki-0.143.apm">
+    <version name="0.144" url="http://openacs.org/repository/download/apm/xowiki-0.144.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>
+        <summary>A xotcl-based enterprise wiki wiki system with different object types
+based on the content OpenACS repository</summary>
         <release-date>2011-05-16</release-date>
         <vendor>Gustaf Neumann, WU Wien</vendor>
         <description format="text/html">&lt;pre&gt;
@@ -56,12 +56,12 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.143"/>
+        <provides url="xowiki" version="0.144"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
         <requires url="general-comments" version="4.6.1"/>
-        <requires url="xotcl-core" version="0.121"/>
+        <requires url="xotcl-core" version="0.124"/>
         <requires url="acs-subsite" version="5.2"/>
 
         <callbacks>
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.208 -r1.209
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	21 Mar 2012 13:45:31 -0000	1.208
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	22 Mar 2012 10:42:55 -0000	1.209
@@ -791,7 +791,7 @@
     set file_object [$package_id get_page_from_name -name $entry_info(name) -parent_id $entry_info(parent_id)]
     if {$file_object ne ""} {
       # file entry exists already, create a new revision
-      #my msg "new revision"
+      #my msg "new revision (value $value)"
       $file_object set import_file [my set tmpfile]
       $file_object set mime_type $content_type
       $file_object set title $value
Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.86 -r1.87
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	18 Mar 2012 16:10:45 -0000	1.86
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	22 Mar 2012 10:42:55 -0000	1.87
@@ -305,6 +305,7 @@
     }
     if {[my exists extra_query_parameter]} {
       set internal_href [export_vars -base $internal_href [my extra_query_parameter]]
+      set internal_href [string map [list ' "&apos;"] $internal_href]
       if {[my exists revision_id]} {append href &revision_id=[my revision_id]}
     } else {
       if {[my exists revision_id]} {append internal_href ?revision_id=[my revision_id]}
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.305 -r1.306
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	21 Mar 2012 13:45:32 -0000	1.305
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	22 Mar 2012 10:42:55 -0000	1.306
@@ -437,7 +437,8 @@
     $package_id set delivery \
         [expr {$use_bg_delivery ? "ad_returnfile_background" : "ns_returnfile"}]
     if {[my exists_query_parameter filename]} {
-      ns_set put [ns_conn outputheaders] Content-Disposition "attachment;filename=\"[my query_parameter filename]\""
+      set fn [::xo::backslash_escape \" [my query_parameter filename]]
+      ns_set put [ns_conn outputheaders] Content-Disposition "attachment;filename=\"$fn\""
     }
     #my log "--F FILE=[my full_file_name] // $mime_type"
     set geometry [::xo::cc query_parameter geometry ""]