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.239.2.12 -r1.239.2.13
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	1 Apr 2014 18:37:33 -0000	1.239.2.12
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	15 Apr 2014 06:33:14 -0000	1.239.2.13
@@ -936,7 +936,7 @@
       # - the formfield is not disabled, and
       # - the form-field is not sticky (default)
       
-      set disabled [expr {[my exists disabled] && [my disabled] ne "false"}]
+      set disabled [expr {[my exists disabled] && [my disabled] != "false"}]
       if {$value ne "" && !$disabled && ![my sticky] } {
         ::html::input -type button -value clear \
             -onClick "document.getElementById('$id').value = ''; document.getElementById('__a$id').style.display = 'none';"
@@ -1659,7 +1659,7 @@
   }
 
   richtext::ckeditor instproc render_input {} {
-    set disabled [expr {[my exists disabled] && [my disabled] ne "false"}]
+    set disabled [expr {[my exists disabled] && [my disabled] != "false"}]
     if {![my istype ::xowiki::formfield::richtext] || $disabled } {
       my render_richtext_as_div
     } else {
@@ -1851,8 +1851,8 @@
   }
   
   richtext::ckeditor4 instproc render_input {} {
-    set disabled [expr {[my exists disabled] && [my disabled] ne "false"}]
-    set is_repeat_template [expr {[my exists is_repeat_template] && [my set is_repeat_template] eq "true"}]
+    set disabled [expr {[my exists disabled] && [my disabled] != "false"}]
+    set is_repeat_template [expr {[my exists is_repeat_template] && [my set is_repeat_template] == "true"}]
     # my msg "[my id] [my name] - $is_repeat_template"
     
     # if value is empty, we need something to be clickable for display mode inline or inplace
@@ -2003,7 +2003,7 @@
     my set widget_type richtext
   }
   richtext::wym instproc render_input {} {
-    set disabled [expr {[my exists disabled] && [my disabled] ne "false"}]
+    set disabled [expr {[my exists disabled] && [my disabled] != "false"}]
     if {![my istype ::xowiki::formfield::richtext] || $disabled } {
       my render_richtext_as_div
     } else {
@@ -2112,7 +2112,7 @@
   }
 
   richtext::xinha instproc render_input {} {
-    set disabled [expr {[my exists disabled] && [my disabled] ne "false"}]
+    set disabled [expr {[my exists disabled] && [my disabled] != "false"}]
     if {![my istype ::xowiki::formfield::richtext] || $disabled} {
       my render_richtext_as_div
     } else {
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 -N -r1.191.2.12 -r1.191.2.13
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	14 Apr 2014 21:33:09 -0000	1.191.2.12
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	15 Apr 2014 06:33:15 -0000	1.191.2.13
@@ -2631,7 +2631,7 @@
     {-with_footer "false"}
   } {
     my instvar __including_page
-    if {$cnames ne "" || $allow_reorder ne "" || $with_footer ne "false"} {
+    if {$cnames ne "" || $allow_reorder ne "" || $with_footer != "false"} {
       error "ignoring cnames, allow_reorder, and with_footer for the time being"
     }
 
@@ -2673,7 +2673,7 @@
     {-with_footer "false"}
   } {
     my instvar __including_page
-    if {$cnames ne "" || $allow_reorder ne "" || $with_footer ne "false"} {
+    if {$cnames ne "" || $allow_reorder ne "" || $with_footer != "false"} {
       error "ignoring cnames, allow_reorder, and with_footer for the time being"
     }
 
@@ -2727,7 +2727,7 @@
     {-with_footer "false"}
   } {
     my instvar __including_page
-    if {$cnames ne "" || $allow_reorder ne "" || $with_footer ne "false"} {
+    if {$cnames ne "" || $allow_reorder ne "" || $with_footer != "false"} {
       error "ignoring cnames, allow_reorder, and with_footer for the time being"
     }
 
@@ -2787,7 +2787,7 @@
     {-with_footer "false"}
   } {
     my instvar __including_page
-    if {$cnames ne "" || $allow_reorder ne "" || $with_footer ne "false"} {
+    if {$cnames ne "" || $allow_reorder ne "" || $with_footer != "false"} {
       error "ignoring cnames, allow_reorder, and with_footer for the time being"
     }
     
@@ -2865,7 +2865,7 @@
     {-with_footer "false"}
   } {
     my instvar __including_page
-    if {$cnames ne "" || $allow_reorder ne "" || $with_footer ne "false"} {
+    if {$cnames ne "" || $allow_reorder ne "" || $with_footer != "false"} {
       error "ignoring cnames, allow_reorder, and with_footer for the time being"
     }
 
Index: openacs-4/packages/xowiki/tcl/repeat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/repeat-procs.tcl,v
diff -u -N -r1.2.2.3 -r1.2.2.4
--- openacs-4/packages/xowiki/tcl/repeat-procs.tcl	13 Mar 2014 13:00:01 -0000	1.2.2.3
+++ openacs-4/packages/xowiki/tcl/repeat-procs.tcl	15 Apr 2014 06:33:15 -0000	1.2.2.4
@@ -170,7 +170,7 @@
         set nrItems $providedValues
       }
       incr nrItems
-      set containerDisabled [expr {[my exists disabled] && [my disabled] ne "false"}]
+      set containerDisabled [expr {[my exists disabled] && [my disabled] != "false"}]
       foreach c [my components] {
         set atts [list class $CSSclass]
         if {$i > $nrItems || [string match "*.0" [$c name]]} {
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 -N -r1.472.2.14 -r1.472.2.15
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	1 Apr 2014 18:37:34 -0000	1.472.2.14
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Apr 2014 06:33:15 -0000	1.472.2.15
@@ -493,7 +493,7 @@
     # necessary to move e.g. category definitions into the global form
     # constraints.
     #
-    if {$mode eq "copy" && ![string match *revision_id* [my set instance_attributes]]} {
+    if {$mode eq "copy" && ![string match "*revision_id*" [my set instance_attributes]]} {
       return [next]
     }
     set form_fields [my create_form_fields_from_form_constraints \
@@ -3233,7 +3233,7 @@
                  -named_objects $named_objects -object_named_after "item_id" \
                  -object_class ::xowiki::FormPage -initialize $initialize]
 
-  if {!$use_hstore && $wc(tcl) ne "true"} {
+  if {!$use_hstore && $wc(tcl) != "true"} {
     # Make sure, that the expr method is available; 
     # in xotcl 2.0 this will not be needed
     ::xotcl::alias ::xowiki::FormPage expr -objscope ::expr