Index: openacs-4/packages/calendar/www/cal-item-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-create.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/calendar/www/cal-item-create.tcl	16 Mar 2002 21:06:44 -0000	1.11
+++ openacs-4/packages/calendar/www/cal-item-create.tcl	5 Apr 2002 19:12:25 -0000	1.12
@@ -23,6 +23,11 @@
     {item_type_id ""}
 } 
 
+# Fix up the return URL
+if {[empty_string_p $return_url]} {
+    set return_url "?[export_url_vars date action view]"
+}
+
 if { $date == "now" } {
     set date [dt_sysdate] 
 }
@@ -129,4 +134,4 @@
 
 # set the date to be the date of the event
 set date [calendar_make_date [array get event_date]]
-ad_returnredirect "${return_url}?[export_url_vars date action view calendar_id]"
+ad_returnredirect "${return_url}"
Index: openacs-4/packages/calendar/www/cal-item-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-edit.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/calendar/www/cal-item-edit.tcl	16 Mar 2002 21:06:44 -0000	1.6
+++ openacs-4/packages/calendar/www/cal-item-edit.tcl	5 Apr 2002 19:12:25 -0000	1.7
@@ -21,6 +21,11 @@
     {item_type_id ""}
 } 
 
+# Fix up the return URL
+if {[empty_string_p $return_url]} {
+    set return_url "?[export_url_vars date action view]"
+}
+
 # find out the user_id 
 set user_id [ad_verify_and_get_user_id]
 
@@ -34,7 +39,7 @@
 
  cal_item_delete $cal_item_id
 
-    ad_returnredirect "${return_url}?[export_url_vars date action view]"
+    ad_returnredirect $return_url
 
     return
 }
@@ -74,4 +79,4 @@
 set action "view"
 set date [calendar_make_date [array get event_date]]
 
-ad_returnredirect "${return_url}?[export_url_vars date action view]"
+ad_returnredirect $return_url