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.3 -r1.4
--- openacs-4/packages/acs-admin/tcl/merge-procs.tcl	27 Jul 2006 00:31:25 -0000	1.3
+++ openacs-4/packages/acs-admin/tcl/merge-procs.tcl	7 Aug 2017 23:47:45 -0000	1.4
@@ -22,24 +22,24 @@
 } {
     ns_log Notice "Running merge::MergeUserInfo"
     db_transaction {
-	if { ![db_0or1row to_user_portrait {*SQL*}] &&  [db_0or1row from_user_portrait {*SQL*}] } {
-	    db_dml upd_portrait {*SQL*}
+	if { ![db_0or1row to_user_portrait {}] &&  [db_0or1row from_user_portrait {}] } {
+	    db_dml upd_portrait {}
 	} 
 	
 	# get the permissions of the from_user_id
 	# and grant them to the to_user_id
-	db_foreach getfromobjs {*SQL*} {
+	db_foreach getfromobjs {} {
 	    # 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*} ] } {
+	    if { ![db_string touserhas {} ] } {
 		# 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*} 	
+	db_dml acs_objs_upd {} 	
     }
     ns_log Notice "Finishing merge::MergeUserInfo"
 }
@@ -57,3 +57,9 @@
     Show information of accounts to merge
 } -
 
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: