Index: openacs-4/packages/ecommerce/www/address.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/ecommerce/www/address.tcl	8 Mar 2004 19:46:11 -0000	1.8
+++ openacs-4/packages/ecommerce/www/address.tcl	13 Jan 2005 13:57:57 -0000	1.9
@@ -21,7 +21,7 @@
 
 # we need them to be logged in
 
-set user_id [ad_verify_and_get_user_id]
+set user_id [ad_conn user_id]
 if {$user_id == 0} {
     set return_url "[ad_conn url]"
     ad_returnredirect "/register?[export_url_vars return_url]"
@@ -72,12 +72,8 @@
 
     # set attn just in case it gets used
     # avoid using it for single field name entry. 
+    set attn "$first_names   $last_name"
 
-    set attn [db_string get_full_name "
-    	select first_names || '   ' || last_name as name 
-    	from cc_users 
-    	where user_id=:user_id"]
-
 }
 if { ![info exists state_widget] } {
     set state_widget [state_widget]
@@ -106,6 +102,7 @@
     append hidden_form_vars "[export_form_vars [ns_set key $form_set $i]]"
 }
 
+# set the defaults for name fields if they are empty
 if {[info exists last_name] != 1} {
    if {[info exists attn]} {
     # delimiter is triple space (for parsing).