Index: openacs-4/packages/acs-admin/www/users/merge-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-confirm.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/users/merge-confirm.tcl 4 Jun 2006 00:45:20 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/merge-confirm.tcl 10 Jan 2007 21:22:00 -0000 1.3 @@ -14,14 +14,14 @@ if_diff_authority { set from_authority_id [db_string gettoa "select authority_id from cc_users where user_id = :from_user_id"] set to_authority_id [db_string getfroma "select authority_id from cc_users where user_id = :to_user_id"] - if { ![string equal $from_authority_id $to_authority_id] } { + if { $from_authority_id ne $to_authority_id } { ad_complain "Merge only works for users from the same authority" } } } -if { [string equal $merge_action "0"] } { +if {$merge_action eq "0"} { set tempid $from_user_id set from_user_id $to_user_id set to_user_id $tempid