Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.200.2.11 -r1.200.2.12
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	1 Jun 2016 10:42:22 -0000	1.200.2.11
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	5 Jun 2016 12:45:53 -0000	1.200.2.12
@@ -194,20 +194,20 @@
       set and_names [list]
       foreach cid_and [split $cid_or ,] {
         if {![string is integer -strict $cid_and]} {
-          ad_return_complaint 1 "invalid category id '$cid_and'"
+          ad_return_complaint 1 "invalid category id '[ns_quotehtml $cid_and]'"
           ad_script_abort
         }
         lappend and_names [::category::get_name $cid_and]
         lappend ands "exists (select 1 from category_object_map \
            where object_id = $item_ref and category_id = $cid_and)"
       }
-      lappend or_names "[join $and_names { and }]"
+      lappend or_names [join $and_names { and }]
       lappend ors "([join $ands { and }])"
     }
     if {$ors eq "()"} {
       set cnames ""
     } else {
-      set cnames "[join $or_names { or }]"
+      set cnames [join $or_names { or }]
       set extra_where_clause "and ([join $ors { or }])"
     }
     #my log "--cnames $category_spec -> $cnames // <$extra_where_clause>"
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.291.2.23 -r1.291.2.24
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	1 Jun 2016 10:41:36 -0000	1.291.2.23
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	5 Jun 2016 12:45:53 -0000	1.291.2.24
@@ -892,7 +892,7 @@
             #
             # The exception might have been due to invalid input parameters
             #
-            ad_return_complaint 1 $errorMsg
+            ad_return_complaint 1 [ns_quotehtml $errorMsg]
             ad_script_abort
           } else {
             #
@@ -1010,7 +1010,7 @@
                           method [my query_parameter m]]
       } else {
         set object [$id get_parameter index_page "index"]
-        #my log "--o object is now '$object'"
+        my log "--o object after getting index_page is '$object'"
       }
     }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.485.2.27 -r1.485.2.28
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	13 May 2016 08:00:26 -0000	1.485.2.27
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	5 Jun 2016 12:45:53 -0000	1.485.2.28
@@ -1871,7 +1871,7 @@
         set html ""
       } elseif {[string match "*for parameter*" $errorMsg]} {
         set html ""
-        ad_return_complaint 1 $errorMsg
+        ad_return_complaint 1 [ns_quotehtml $errorMsg]
       } else {
         ad_log error "render_includelet $includeletClass led to: $errorMsg ($errorCode)"
         set page_name [$includelet name]