Index: openacs-4/packages/calendar/www/view-one-day-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/calendar/www/view-one-day-display.tcl	8 Aug 2006 21:26:18 -0000	1.33
+++ openacs-4/packages/calendar/www/view-one-day-display.tcl	16 Aug 2006 17:52:14 -0000	1.34
@@ -8,15 +8,18 @@
 }
 
 set current_date $date
+if {![info exists return_url]} {
+    set return_url [ad_urlencode "../"]
+}
 
 if {[info exists portlet_mode_p] && $portlet_mode_p} {
-    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ad_urlencode "../"]&action=edit&cal_item_id=\$item_id"
+    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=${return_url}&action=edit&cal_item_id=\$item_id"
     set url_stub_callback "calendar_portlet_display::get_url_stub"
-    set hour_template "calendar/cal-item-new?date=$current_date&start_time=\$day_current_hour"
+    set hour_template "calendar/cal-item-new?date=$current_date&start_time=\$day_current_hour&return_url=$return_url"
 } else {
     set item_template "cal-item-view?cal_item_id=\$item_id"
     set url_stub_callback ""
-    set hour_template {cal-item-new?date=$current_date&start_time=$day_current_hour}
+    set hour_template {cal-item-new?date=$current_date&start_time=$day_current_hour&return_url=$return_url}
 }
 
 if { ![info exists show_calendar_name_p] } {