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 -N -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/users/merge-confirm.tcl	27 Oct 2014 16:38:57 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/merge-confirm.tcl	7 Aug 2017 23:47:45 -0000	1.5
@@ -12,8 +12,8 @@
     context:onevalue
 } -validate {
     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"]
+	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 { $from_authority_id ne $to_authority_id } {
 	    ad_complain "Merge only works for users from the same authority"
 	}
@@ -33,15 +33,20 @@
 
 
 # information of from_user_id
-db_1row from_get_info { *SQL* }
+db_1row from_get_info {}
 
 
 # information of to_user_id
-db_1row to_get_info { *SQL* }
+db_1row to_get_info {}
 
 # information of user_id one
-if { [db_0or1row to_user_portrait { *SQL* }] } {
+if { [db_0or1row to_user_portrait {}] } {
     set to_img_src "[subsite::get_element -element url]shared/portrait-bits.tcl?user_id=$to_user_id"
 } else {
     set to_img_src "/resources/acs-admin/not_available.gif"
-}
\ No newline at end of file
+}
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: