Index: openacs.org-dev/packages/ecommerce/www/delete-address.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/delete-address.tcl,v
diff -u -r1.1.1.2 -r1.1.1.3
--- openacs.org-dev/packages/ecommerce/www/delete-address.tcl	5 Aug 2002 21:38:45 -0000	1.1.1.2
+++ openacs.org-dev/packages/ecommerce/www/delete-address.tcl	8 Oct 2002 15:47:06 -0000	1.1.1.3
@@ -4,11 +4,13 @@
     it will no longer be available.
 
     @param address_id
+    @param referer
 
     @author Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
     @creation-date April 2002
 } {
     address_id
+    referer
 }
 
 # Can't remove the address from the database as old orders might refer
@@ -28,23 +30,9 @@
 
 set deleted_address [ec_display_as_html [ec_pretty_mailing_address_from_args $line1 $line2 $city $usps_abbrev $zip_code $country_code \
 						$full_state_name $attn $phone $phone_time]]
+db_release_unused_handles
 
-# Get the location from which delete-address was called.
+# Return to the calling page (E.g. checkout, billing,
+# giftcertificate-billing).
 
-set header_set [ns_conn headers]
-set action [ns_set get [ns_conn headers] Referer]
-# This will set "action" to be "foo" out of "http://bar.com/baz/foo"
-set action [string range $action [expr [string last "/" $action] + 1] end]
-
-# Get the form vars that were passed on delete-address so that they
-# can be passed back to the calling url. gift-certificate-billing has
-# a bunch of form vars that should not be lost.
-
-set hidden_form_vars ""
-set form_set [ns_getform]
-for {set i 0} {$i < [ns_set size $form_set]} {incr i} {
-    set [ns_set key $form_set $i] [ns_set value $form_set $i]
-    append hidden_form_vars "[export_form_vars [ns_set key $form_set $i]]"
-}
-
-db_release_unused_handles
+rp_internal_redirect $referer