Index: openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl,v
diff -u -r1.22.4.1 -r1.22.4.2
--- openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl	30 Sep 2013 17:44:27 -0000	1.22.4.1
+++ openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl	2 Oct 2013 08:42:38 -0000	1.22.4.2
@@ -229,7 +229,7 @@
     @error
 } {
     upvar $array_name local_array
-    if {[lsearch {live latest} $revision] == -1} {
+    if {$revision ni {live latest}} {
         error "content::item::get revision was '${revision}'. It must be 'live' or 'latest'"
     }
     set content_type [content_type -item_id $item_id]
@@ -274,7 +274,7 @@
     foreach {attribute_list} $attributes {
 	set attribute [lindex $attribute_list 0]
 	set value [lindex $attribute_list 1]	
-	if {[lsearch $valid_attributes $attribute] > -1}  {
+	if {$attribute in $valid_attributes}  {
 
 	    # create local variable to use for binding
 
Index: openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl,v
diff -u -r1.25.6.2 -r1.25.6.3
--- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	30 Sep 2013 17:44:27 -0000	1.25.6.2
+++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	2 Oct 2013 08:42:38 -0000	1.25.6.3
@@ -120,7 +120,7 @@
 	}
 	foreach attribute_pair $attributes {
             lassign $attribute_pair attribute_name attribute_value
-	    if {[lsearch $valid_attributes $attribute_name] > -1}  {
+	    if {[lsearch -exact $valid_attributes $attribute_name] > -1}  {
 
                 # first add the column name to the list
 		append attribute_names  ", ${attribute_name}"		
Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl,v
diff -u -r1.33 -r1.33.2.1
--- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	12 Apr 2013 16:12:56 -0000	1.33
+++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	2 Oct 2013 08:42:38 -0000	1.33.2.1
@@ -282,7 +282,7 @@
 
 content::get_content $content_type
 
-if { !\[string equal \"text/html\" \$content(mime_type)\] && !\[ad_html_text_convertable_p -from \$content(mime_type) -to text/html\] } {
+if { \"text/html\" ne \$content(mime_type) && !\[ad_html_text_convertable_p -from \$content(mime_type) -to text/html\] } {
     \# don't render its content
     cr_write_content -revision_id \$content(revision_id)
     ad_script_abort
Index: openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl	30 Sep 2013 17:44:27 -0000	1.10.2.1
+++ openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl	2 Oct 2013 08:42:38 -0000	1.10.2.2
@@ -389,7 +389,7 @@
   # Concatenate all the extra html arguments into a string
   if { [info exists opts(html)] } {
     set extra_html [publish::html_args $opts(html)]
-    set have_alt [expr [lsearch [string tolower $opts(html)] "alt"] >= 0]
+    set have_alt [expr {"alt" in [string tolower $opts(html)]}]
   } else {
     set extra_html ""
     set have_alt 0