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 -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/acs-admin/www/users/merge-confirm.tcl 10 Sep 2015 08:21:09 -0000 1.4.2.1 +++ openacs-4/packages/acs-admin/www/users/merge-confirm.tcl 2 Jan 2016 13:50:16 -0000 1.4.2.2 @@ -33,14 +33,14 @@ # 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"