Index: openacs-4/packages/acs-admin/www/users/merge.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-admin/www/users/merge.tcl	10 Sep 2015 08:21:09 -0000	1.6.2.1
+++ openacs-4/packages/acs-admin/www/users/merge.tcl	2 Jan 2016 13:50:16 -0000	1.6.2.2
@@ -26,13 +26,13 @@
 #
 # Information of user_id_one
 #
-if { [db_0or1row one_user_portrait { *SQL* }] } {
+if { [db_0or1row one_user_portrait {}] } {
     set one_img_src "[subsite::get_element -element url]shared/portrait-bits.tcl?user_id=$user_id"
 } else {
     set one_img_src "/resources/acs-admin/not_available.gif"
 }
 
-db_1row one_get_info { *SQL* }
+db_1row one_get_info {}
 
 db_multirow -extend {one_item_object_url} one_user_contributions one_user_contributions { *SQL* } {
     set one_item_object_url  "[site_node::get_url_from_object_id -object_id $object_id]"
@@ -57,13 +57,13 @@
 #
 # Information of user_id_two
 #
-if { [db_0or1row two_user_portrait { *SQL* }] } {
+if { [db_0or1row two_user_portrait {}] } {
     set two_img_src "[subsite::get_element -element url]shared/portrait-bits.tcl?user_id=$user_id_from_search"
 } else {
     set two_img_src "/resources/acs-admin/not_available.gif"
 }
 
-db_1row two_get_info { *SQL* }
+db_1row two_get_info {}
 
 db_multirow -extend {two_item_object_url} two_user_contributions two_user_contributions { *SQL* } {
     set two_item_object_url "[site_node::get_url_from_object_id -object_id $object_id]"