Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl	18 Sep 2002 21:33:46 -0000	1.4
@@ -29,7 +29,7 @@
 if {$user_id == 0} {
     set return_url "[ad_conn url]"
     ad_returnredirect "/register?[export_url_vars return_url]"
-    return
+    ad_script_abort
 }
 
 # Make sure order exists (they might have discarded it then pushed
@@ -40,7 +40,7 @@
     from ec_orders 
     where order_id=:order_id"] } {
     ad_returnredirect shopping-cart
-    return
+    ad_script_abort
 }
 
 # Make sure this order is theirs
@@ -60,7 +60,7 @@
 	<p>The order you have selected either does not exist or does not belong to you. 
 	   Please contact <a href=\"mailto:[ec_system_owner]\">[ec_system_owner]</a> if this is incorrect.</p>
 	[ec_footer]"
-    return
+    ad_script_abort
 }
 
 # Make sure the order is still a "saved shopping basket", otherwise
@@ -73,7 +73,7 @@
     and order_state='in_basket' 
     and saved_p='t'"] } {
     ad_returnredirect "shopping-cart"
-    return
+    ad_script_abort
 }
 
 # End security checks
@@ -138,7 +138,7 @@
     set ec_system_owner [ec_system_owner]
     db_release_unused_handles
     ad_return_template
-    return
+    ad_script_abort
 } elseif { $submit == "Retrieve" } {
 
     # First see if they already have a non-empty shopping basket, in
@@ -209,7 +209,7 @@
 
 	db_release_unused_handles
 	ad_returnredirect "shopping-cart"
-	return
+        ad_script_abort
     } else {
 
 	# The hard case, either they can merge their saved order with
@@ -223,7 +223,7 @@
 	set ec_system_owner [ec_system_owner]
 
 	ad_return_template
-	return
+        ad_script_abort
     }
 } elseif { $submit == "Merge" } {
 
@@ -240,7 +240,7 @@
 	and order_state='in_basket'" -default ""]
     if { [empty_string_p $current_basket] } {
 	ad_returnredirect shopping-cart
-	return
+        ad_script_abort
     }
     db_transaction {
 	db_dml update_order_basket_pr "
@@ -290,7 +290,7 @@
 
     db_release_unused_handles
     ad_returnredirect shopping-cart
-    return
+    ad_script_abort
 } elseif { $submit == "Replace" } {
 
     # Delete the items in the current basket and update the items in
@@ -306,7 +306,7 @@
 	and order_state='in_basket'" -default ""]
     if { [empty_string_p $current_basket] } {
 	ad_returnredirect shopping-cart
-	return
+        ad_script_abort
     }
 
     db_transaction {
@@ -360,7 +360,7 @@
 
     db_release_unused_handles
     ad_returnredirect shopping-cart
-    return
+    ad_script_abort
 } elseif { $submit == "Discard" } {
     if { [info exists discard_confirmed_p] && $discard_confirmed_p == "t" } {
 	db_transaction {
@@ -373,7 +373,7 @@
 	}
 
 	ad_returnredirect "shopping-cart"
-	return
+        ad_script_abort
     }
 
     # Otherwise I have to give them a confirmation page
@@ -386,10 +386,10 @@
     set ec_system_owner [ec_system_owner]
 
     ad_return_template
-    return
+    ad_script_abort
 } elseif { $submit == "Save it for Later" } {
     ad_returnredirect "shopping-cart-retrieve-2"
-    return
+    ad_script_abort
 }
 
 # There shouldn't be any other cases, but log it if there are