Index: openacs-4/packages/acs-admin/www/apm/version-reload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-admin/www/apm/version-reload.tcl	27 Oct 2014 16:38:54 -0000	1.10
+++ openacs-4/packages/acs-admin/www/apm/version-reload.tcl	27 Jun 2015 16:41:08 -0000	1.11
@@ -50,9 +50,9 @@
 
             # Remove the two first elements of the path, namely packages/package-key/
             set local_path [file join {*}[lrange [file split $file] 2 end]]
-
+            set href [export_vars -base file-watch { version_id { paths $local_path } }]
             append body [subst {
-                (<a href="file-watch?[export_vars { version_id { paths $local_path } }]">watch this file</a>)
+                (<a href="[ns_quotehtml $href]">watch this file</a>)
             }]
             lappend files_to_watch $local_path
         }
@@ -84,13 +84,13 @@
 
 
 if { [info exists files_to_watch_p] } {
+    set href [export_vars -base file-watch { version_id { paths:multiple $files_to_watch } }]
     append body [subst {
         If you know you're going to be modifying one of the above files frequently,
         select the "watch this file" link next to a filename to cause the interpreters to
         reload the file immediately whenever it is changed.<p>
         <ul class="action-links">
-        <li><a href="file-watch?[export_vars { version_id { paths:multiple $files_to_watch } }]">Watch 
-        all above files</a></li>
+        <li><a href="[ns_quotehtml $href]">Watch all above files</a></li>
     }]
 } else {
     append body "<ul class=\"action-links\">"