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 -N -r1.25.6.3 -r1.25.6.4 --- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl 2 Oct 2013 08:42:38 -0000 1.25.6.3 +++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl 13 Oct 2013 14:25:22 -0000 1.25.6.4 @@ -120,7 +120,7 @@ } foreach attribute_pair $attributes { lassign $attribute_pair attribute_name attribute_value - if {[lsearch -exact $valid_attributes $attribute_name] > -1} { + if {$attribute_name in $valid_attributes} { # first add the column name to the list append attribute_names ", ${attribute_name}" Index: openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl,v diff -u -N -r1.12 -r1.12.4.1 --- openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl 28 Dec 2010 15:21:26 -0000 1.12 +++ openacs-4/packages/acs-content-repository/tcl/content-type-procs.tcl 13 Oct 2013 14:25:22 -0000 1.12.4.1 @@ -54,7 +54,7 @@ @param drop_table_p @param drop_objets_p Drop the objects of this content type along with all entries in cr_items and cr_revisions. Will not be done by default. } { - if {$drop_objects_p eq "f"} { + if {$drop_objects_p == "f"} { return [package_exec_plsql -var_list [list \ [list content_type $content_type ] \ [list drop_children_p $drop_children_p ] \ 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 -N -r1.10.2.2 -r1.10.2.3 --- openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl 2 Oct 2013 08:42:38 -0000 1.10.2.2 +++ openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl 13 Oct 2013 14:25:22 -0000 1.10.2.3 @@ -825,7 +825,7 @@ # Call the appropriate handler function set code [list handle_item $sub_item_id -html $extra_args] - if {$is_embed eq "t"} { + if {$is_embed == "t"} { lappend code -embed } Index: openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl,v diff -u -N -r1.30.4.4 -r1.30.4.5 --- openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl 7 Oct 2013 16:55:59 -0000 1.30.4.4 +++ openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl 13 Oct 2013 14:25:22 -0000 1.30.4.5 @@ -45,9 +45,10 @@ error "Either revision_id or item_id must be specified" } - if { $storage_type ne "file" && \ - $storage_type ne "text" && \ - $storage_type ne "lob" } { + if { $storage_type ne "file" + && $storage_type ne "text" + && $storage_type ne "lob" + } { error "Storage type '$storage_type' is invalid." } @@ -225,7 +226,7 @@ switch $content_type { image { - if { [db_string image_subclass ""] eq "f" } { + if { [db_string image_subclass ""] == "f" } { error "Image file must be stored in an image object" } @@ -268,7 +269,7 @@ error "The file you uploaded was not an image (.gif, .jpg or .jpeg) file" } - if { [db_string content_revision_subclass ""] eq "f" } { + if { [db_string content_revision_subclass ""] == "f" } { error "Content must be stored in a content revision object" }