Index: openacs-4/packages/acs-authentication/tcl/local-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/local-procs.tcl,v
diff -u -N -r1.29.2.1 -r1.29.2.2
--- openacs-4/packages/acs-authentication/tcl/local-procs.tcl	8 Jun 2005 11:11:49 -0000	1.29.2.1
+++ openacs-4/packages/acs-authentication/tcl/local-procs.tcl	8 Jun 2005 21:46:40 -0000	1.29.2.2
@@ -111,24 +111,6 @@
     db_transaction {
 	ns_log Notice "  Merging user portraits"
 
-	if { ![db_0or1row to_user_portrait {*SQL*}] &&  [db_0or1row from_user_portrait {*SQL*}] } {
-	    db_dml upd_portrait {*SQL*}
-	} 
-	
-	# get the permissions of the from_user_id
-	# and grant them to the to_user_id
- 	db_foreach getfromobjs {*SQL*} {
- 	    # revoke the permissions of from_user_id
- 	    permission::revoke -object_id $from_oid -party_id $from_user_id -privilege $from_priv
- 	    if { ![db_string touserhas {*SQL*} ] } {
- 		# grant the permissions to to_user_id
- 		permission::grant -object_id $from_oid -party_id $to_user_id -privilege $from_priv
- 	    } 
- 	}
-	
-	ns_log notice "  Merging acs_objects"
-	db_dml acs_objs_upd  {*SQL*} 	
-
 	ns_log notice "  Merging username, email and basic info in general"
 
 	set new_username "merged_$from_user_id"