Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v
diff -u -r1.55 -r1.56
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	27 Oct 2014 16:42:01 -0000	1.55
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	15 Jun 2015 19:34:27 -0000	1.56
@@ -741,7 +741,7 @@
     set href [export_vars -base [ad_conn url] $query]
     html::a -href $href -title $title {
       html::t [my _ label]
-      html::img -src $img -alt "" -border 0
+      html::img -src $img -alt ""
     }
   }
 
@@ -805,7 +805,7 @@
     set name [my name]
     set value [$line set [my id]]
     html::input -type checkbox -name $name -value $value \
-        -id "$name,$value" \
+        -id "$name---$value" \
         -title "Mark/Unmark this row"
   }
 
@@ -885,7 +885,7 @@
 #
 
 Class ListWidget -superclass ::xo::OrderedComposite -instproc render {} {
-  html::ul {
+  html::ul -class plainlist {
     foreach o [my children] {
       html::li {
         $o render
@@ -936,12 +936,10 @@
     set ::_xo_need_js($name)  1
   }
   Page proc requireLink {-rel -type -title -href} {
-    regsub -all ' $title "'" title
-    regsub -all ' $href "'" href
     if {$::xo::use_template_head} {
       template::head::add_link -rel $rel -href $href -type $type -title $title
     } else {
-      set key "rel='$rel' type='$type' title='$title' href='$href'"
+      set key "rel='[ns_quotehtml $rel]' type='[ns_quotehtml $type]' title='[ns_quotehtml $title]' href='[ns_quotehtml $href]'"
       set ::_xo_need_link($key) 1
     }
   }
Index: openacs-4/packages/xotcl-core/www/cache.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/cache.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/xotcl-core/www/cache.tcl	27 Oct 2014 16:42:02 -0000	1.6
+++ openacs-4/packages/xotcl-core/www/cache.tcl	15 Jun 2015 19:34:27 -0000	1.7
@@ -27,15 +27,15 @@
 
 if { $flush ne "0" } {
   ns_cache flush $cache $flush
-  ad_returnredirect "[ns_conn url]?cache=$cache"
+  ad_returnredirect [export_vars -base [ns_conn url] {cache}]
   ad_script_abort
 } 
 
 if {$flushall == 1} {
   foreach i [ns_cache names $cache] {
     ns_cache flush $cache $i
   }
-  ad_returnredirect "[ns_conn url]?cache=$cache"
+  ad_returnredirect [export_vars -base [ns_conn url] {cache}]
   ad_script_abort
 }
 
@@ -54,7 +54,7 @@
 
   foreach item [lsort [ns_cache_names]] {
     t1 add -name $item \
-        -name.href "?cache=$item" \
+        -name.href "?cache=[ns_quotehtml $item]" \
         -stats [ns_cache_stats $item] \
         -size [lindex [ns_cache_size $item] 1]
 
@@ -67,7 +67,8 @@
 } else {
   set item_list [ns_cache names $cache]
   set item_count [llength $item_list]
-  append output "<a href='?cache=$cache&flushall=1'>flush all</a> items of $cache"
+  set href [export_vars -base . {cache {flushall 1}}]
+  append output "<a href='[ns_quotehtml $href]'>flush all</a> items of [ns_quotehtml $cache]"
 
   append output "<h3>Items in cache $cache ($item_count) with size [ns_cache_size $cache]</h3>\n"
   append output "<form>
@@ -85,7 +86,8 @@
     regexp -- {-set name ([^\\]+)\\} $entry _ n
     set show_url  [export_vars -base [ns_conn url] [list cache [list item $name]]]
     set flush_url [export_vars -base [ns_conn url] [list cache [list flush $name]]]
-    append entries "<li><a href=\"$show_url\">$name</a> $n ([string length $entry] bytes, <a href=\"$flush_url\">flush</a>)</li>"
+    append entries "<li><a href=\"[ns_quotehtml $show_url]\">$name</a> $n ([string length $entry] bytes, " \
+        "<a href=\"[ns_quotehtml $flush_url]\">flush</a>)</li>"
   }
   append entries "</ul>"
   if {$filter ne ""} {