Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.280 -r1.281
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	3 Nov 2018 18:59:55 -0000	1.280
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	17 Dec 2018 17:54:38 -0000	1.281
@@ -389,7 +389,7 @@
     if {[info exists :editor]} {append spec " {options {editor ${:editor}}} "}
     append spec " {label " [list ${:label}] "} "
 
-    if {[string match *bootstrap* [subsite::get_theme]]} {
+    if {[string match "*bootstrap*" [subsite::get_theme]]} {
       array set :html {class "form-control"}
     }
 
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 -N -r1.329 -r1.330
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	3 Nov 2018 18:59:55 -0000	1.329
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	17 Dec 2018 17:54:38 -0000	1.330
@@ -103,7 +103,7 @@
     }
     set suffix [string trim $suffix]
     # temporary measure; TODO: remove the following if-clause
-    if {[string match *:* $suffix]} {
+    if {[string match "*:*" $suffix]} {
       ad_log warning "normalize_name receives name '$suffix' containing a colon. A missing -with_prefix?"
       xo::show_stack
     }