Index: openacs-4/packages/calendar/www/cal-item-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/calendar/www/cal-item-view.tcl	8 Aug 2006 21:26:18 -0000	1.16
+++ openacs-4/packages/calendar/www/cal-item-view.tcl	16 Aug 2006 17:52:14 -0000	1.17
@@ -18,10 +18,13 @@
 
 set write_p [permission::write_permission_p -object_id $cal_item_id -creation_user $cal_item(creation_user)]
 
+if {[exists_and_not_null return_url]} {
+    set return_url [ad_urlencode $return_url]
+}
 
 # Attachments?
 if {$cal_item(n_attachments) > 0} {
-    set item_attachments [attachments::get_attachments -object_id $cal_item(cal_item_id)]
+    set item_attachments [attachments::get_attachments -object_id $cal_item(cal_item_id) -return_url [ad_return_url]]
 } else {
     set item_attachments [list]
 }
@@ -31,7 +34,7 @@
 
 # Attachment URLs
 if {[calendar::attachments_enabled_p]} {
-    set attachment_options " | <A href=\"[attachments::add_attachment_url -object_id $cal_item(cal_item_id) -pretty_name $cal_item(name) -return_url "../cal-item-view?cal_item_id=$cal_item(cal_item_id)"]\" class=\"button\" >add attachment</a>"
+    set attachment_options "\[<A href=\"[attachments::add_attachment_url -object_id $cal_item(cal_item_id) -pretty_name $cal_item(name) -return_url "../cal-item-view?cal_item_id=$cal_item(cal_item_id)"]\" class=\"button\" >add attachment</a>\]"
 } else { 
     set attachment_options {} 
 }