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.324 -r1.325
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	8 Jun 2015 07:48:14 -0000	1.324
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	15 Jun 2015 19:21:07 -0000	1.325
@@ -1059,7 +1059,7 @@
              -groupby "tag" \
              -orderby "nr" \
              -limit $limit] {
-               lappend entries "<a href='$href&ptag=[ad_urlencode $tag]'>$tag ($nr)</a>"
+               lappend entries "<a href='[ns_quotehtml $href&ptag=[ad_urlencode $tag]]'>[ns_quotehtml $tag ($nr)]</a>"
              }
     ns_return 200 text/html "[_ xowiki.popular_tags_label]: [join $entries {, }]"
   }
@@ -1864,7 +1864,7 @@
   Page instproc mutual_overwrite_occurred {} {
      util_user_message -html \
          -message "[_ xowiki.User] <em>[::xo::get_user_name [my set modifying_user]]</em> [_ xowiki.has_modified_this_page]. \
-   [_ xowiki.Please_open] <a href='[::xo::cc url]' target='_blank'>[_ xowiki.modified_page]</a> [_ xowiki.new_window_or_OK]."
+   [_ xowiki.Please_open] <a href='[ns_quotehtml [::xo::cc url]]' target='_blank'>[_ xowiki.modified_page]</a> [_ xowiki.new_window_or_OK]."
     # return 1 to flag validation error, 0 to ignore this fact
     return 1
   }