Index: openacs-4/packages/acs-admin/www/users/merge-final.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/merge-final.tcl	15 Dec 2006 00:00:54 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/merge-final.tcl	10 Jan 2007 21:22:00 -0000	1.4
@@ -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 of the same authority"
 	} 
     }
     if_the_logged_in_user_is_crazy {
 	# Just for security reasons...
 	set current_user_id [ad_conn user_id]
-	if { [string equal $current_user_id $to_user_id] || [string equal $current_user_id $from_user_id] } {
+	if { $current_user_id eq $to_user_id || $current_user_id eq $from_user_id } {
 	    ad_complain "You can't merge yourself"
 	}
     }