Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.152 -r1.153
--- openacs-4/packages/xowiki/xowiki.info	15 May 2015 12:28:00 -0000	1.152
+++ openacs-4/packages/xowiki/xowiki.info	16 Jun 2015 20:33:08 -0000	1.153
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.9.0d2" url="http://openacs.org/repository/download/apm/xowiki-5.9.0d2.apm">
+    <version name="5.9.0d3" url="http://openacs.org/repository/download/apm/xowiki-5.9.0d3.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2015-05-03</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.9.0d2"/>
+        <provides url="xowiki" version="5.9.0d3"/>
         <requires url="acs-datetime" version="5.8.1"/>
         <requires url="acs-kernel" version="5.8.1"/>
         <requires url="acs-subsite" version="5.8.1"/>
Index: openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	2 May 2015 16:38:34 -0000	1.9
+++ openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	16 Jun 2015 20:33:08 -0000	1.10
@@ -635,6 +635,22 @@
       # Simply refresh all of these
       ::xowiki::refresh_id_column_fk_constraints
     }
+
+    set v 5.9.0d3
+    if {[apm_version_names_compare $from_version_name $v] == -1 &&
+        [apm_version_names_compare $to_version_name $v] > -1} {
+      ns_log notice "-- upgrading to $v"
+      
+      foreach package_id [::xowiki::Package instances -closure true] {
+        ::xowiki::Package initialize -package_id $package_id -init_url false
+        # reload updated prototype pages
+        $package_id import-prototype-page bib
+        $package_id import-prototype-page news
+        $package_id import-prototype-page weblog-portlet
+      }
+    }
+
+    
   }
   
 }
Index: openacs-4/packages/xowiki/www/prototypes/bib.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/bib.page,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/prototypes/bib.page	5 Aug 2013 14:32:13 -0000	1.6
+++ openacs-4/packages/xowiki/www/prototypes/bib.page	16 Jun 2015 20:33:08 -0000	1.7
@@ -43,12 +43,12 @@
     set next ""
     
     if {[info exists prev_page_link]} {
-      set prev "<a href='$prev_page_link'>\
+        set prev "<a href='[ns_quotehtml $prev_page_link]'>\
         <img border='0' src='/resources/acs-subsite/left.gif' width='13' height='13' \
              alt='Previous Page' style='float: left;  top: 0px;'></a>"
     }
     if {[info exists next_page_link]} {
-      set next "<a href='$next_page_link'>\
+	set next "<a href='[ns_quotehtml $next_page_link]'>\
         <img border='0' src='/resources/acs-subsite/right.gif' width='13' height='13' \
              alt='Next Page' style='float: left;  top: 0px;'></a>"
     }
Index: openacs-4/packages/xowiki/www/prototypes/news.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/news.page,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/xowiki/www/prototypes/news.page	5 Aug 2013 14:32:13 -0000	1.20
+++ openacs-4/packages/xowiki/www/prototypes/news.page	16 Jun 2015 20:33:08 -0000	1.21
@@ -56,15 +56,15 @@
     set link [my detail_link]
     regsub -all & $link "&amp;" link
     set more [expr {[$weblog_obj summary] ? 
-                    " <span class='more'> \[<a href='$link'>#xowiki.weblog-more#</a>\]</span>" : ""}]
+                    " <span class='more'> \[<a href='[ns_quotehtml $link]'>#xowiki.weblog-more#</a>\]</span>" : ""}]
     #append more "<p></p>"
     set day [lc_time_fmt [my set publish_date] "%x"]
     set my_footer [my htmlFooter]
 
     set edit_button [my include [list edit-item-button -book_mode true]]
     if {$edit_button ne ""} {set edit_button "<div style='float: right'>$edit_button</div>"}
     append content "<DIV class='news-item' style='clear: both;'>" $edit_button \
-        "<div class='item-header'><h2><a href='$link'>[ad_quotehtml $title]</a></h2>" \
+        "<div class='item-header'><h2><a href='[ns_quotehtml $link]'>[ns_quotehtml $title]</a></h2>" \
         "&nbsp;<span class='date'>($day)</span></div>\n" \
         $description $more $my_footer \n\
         "</DIV>"
@@ -85,12 +85,12 @@
       set filter  "<div class='filter'>$filter_msg</div>"
     } 
     if {[info exists prev_page_link]} {
-      set prev "<a href='$prev_page_link'>\
+	set prev "<a href='[ns_quotehtml $prev_page_link]'>\
         <img border='0' src='/resources/acs-subsite/left.gif' width='13' height='13' \
              alt='Previous Page' style='float: left;  top: 0px;'></a>"
     }
     if {[info exists next_page_link]} {
-      set next "<a href='$next_page_link'>\
+	set next "<a href='[ns_quotehtml $next_page_link]'>\
         <img border='0' src='/resources/acs-subsite/right.gif' width='13' height='13' \
              alt='Next Page' style='float: left;  top: 0px;'></a>"
     }
Index: openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/Attic/weblog-portlet.page,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page	27 Oct 2014 16:42:07 -0000	1.23
+++ openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page	16 Jun 2015 20:33:08 -0000	1.24
@@ -29,12 +29,12 @@
     set link [my detail_link]
     set show_more [expr {[$weblog_obj summary] && [my exists text] && [my text] ne ""}]
     set more [expr {$show_more ? 
-                    " <span class='more'> \[<a href='$link'>#xowiki.weblog-more#</a>\]</span>" : ""}]
+                    " <span class='more'> \[<a href='[ns_quotehtml $link]'>#xowiki.weblog-more#</a>\]</span>" : ""}]
     append more "<p></p>"
     set my_footer [my htmlFooter]
 
     append content "<DIV class='post' style='background: #f8f8f8;'>" \
-        "<h2><a href='$link'>$title</a></h2>" \
+        "<h2><a href='[ns_quotehtml $link]'>$title</a></h2>" \
         "<p class='auth'>Created by $creator, " \
         "last modified by [::xo::get_user_name $creation_user] " \
         "<span class='date'>$pretty_date</span></p>" \
@@ -59,12 +59,12 @@
       set filter  "<div class='filter'>$filter_msg</div>"
     } 
     if {[info exists prev_page_link]} {
-      set prev "<a href='$prev_page_link'>\
+	set prev "<a href='[ns_quotehtml $prev_page_link]'>\
         <img border='0' src='/resources/acs-subsite/left.gif' width='13' height='13' \
              alt='Previous Page' style='float: left;  top: 0px;'></a>"
     }
     if {[info exists next_page_link]} {
-      set next "<a href='$next_page_link'>\
+	set next "<a href='[ns_quotehtml $next_page_link]'>\
         <img border='0' src='/resources/acs-subsite/right.gif' width='13' height='13' \
              alt='Next Page' style='float: left;  top: 0px;'></a>"
     }