Index: openacs-4/packages/acs-admin/tcl/merge-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/merge-procs.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-admin/tcl/merge-procs.tcl 4 Jun 2006 00:45:19 -0000 1.2 +++ openacs-4/packages/acs-admin/tcl/merge-procs.tcl 27 Jul 2006 00:31:25 -0000 1.3 @@ -14,6 +14,12 @@ -from_user_id:required -to_user_id:required } { + Merge user info. Revokes permissions for from_user_id and grants + them to to_user_id. + + @param from_user_id From user ID. + @param to_user_id To user ID. +} { ns_log Notice "Running merge::MergeUserInfo" db_transaction { if { ![db_0or1row to_user_portrait {*SQL*}] && [db_0or1row from_user_portrait {*SQL*}] } {