Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	11 Sep 2008 14:13:42 -0000	1.29
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	12 Sep 2008 16:13:01 -0000	1.30
@@ -56,7 +56,7 @@
      page_num=@page_num@
      calendar_id_list=@list_of_calendar_ids@ 
      calendar_url="@calendar_url@"
-     return_url="@encoded_return_url;noquote@">
+     return_url="@return_url;noquote@">
    </case>
 
   <case value="list">
@@ -68,15 +68,15 @@
      calendar_id_list=@list_of_calendar_ids@ 
      page_num=@page_num@
      calendar_url="@calendar_url@"
-     return_url="@encoded_return_url;noquote@">
+     return_url="@return_url;noquote@">
   </case>
   
   <case value="week">
      <include src="/packages/calendar/www/view-week-display" 
      date="@current_date@"
      calendar_id_list=@list_of_calendar_ids@ 
      page_num=@page_num@
-     return_url="@encoded_return_url;noquote@"
+     return_url="@return_url;noquote@"
      calendar_url="@calendar_url@"
      export=@export@>
  </case>
@@ -87,7 +87,7 @@
      calendar_id_list=@list_of_calendar_ids@ 
      page_num=@page_num@
      show_calendar_name_p="@show_calendar_name_p;noquote@"
-     return_url="@encoded_return_url;noquote@"
+     return_url="@return_url;noquote@"
      calendar_url="@calendar_url@"
      export=@export@>
   </case>
Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v
diff -u -r1.37 -r1.38
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	11 Sep 2008 14:13:42 -0000	1.37
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	12 Sep 2008 16:13:01 -0000	1.38
@@ -114,7 +114,6 @@
 set date_format "YYYY-MM-DD HH24:MI"
 set return_url "[ns_conn url]?[ns_conn query]"
 
-set encoded_return_url [ns_urlencode $return_url]
 set add_item_url [export_vars -base "calendar/cal-item-new" {{date $current_date} {time_p 1} return_url}]
 
 if {$view == "list"} {
Index: openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp	11 Sep 2008 14:13:42 -0000	1.10
+++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp	12 Sep 2008 16:13:01 -0000	1.11
@@ -27,6 +27,7 @@
   page_num=@page_num@
   calendar_id_list=@list_of_calendar_ids@ 
   calendar_url="@calendar_url@"
+  return_url="@return_url@"
   sort_by=@sort_by@> 
 </if>
 <else>
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	11 Sep 2008 14:13:42 -0000	1.18
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	12 Sep 2008 16:13:01 -0000	1.19
@@ -23,6 +23,7 @@
  <switch @view@>
    <case value="day">
      <include src="/packages/calendar/www/view-one-day-display" 
+     return_url="@return_url;noquote@"
      date="@date@" 
      start_display_hour=7 
      end_display_hour=22
@@ -33,6 +34,7 @@
 
     <case value="list">
       <include src="/packages/calendar/www/view-list-display" 
+      return_url="@return_url;noquote@"
       start_date=@start_date@ 
       end_date=@end_date@ 
       date=@current_date@ 
@@ -46,6 +48,7 @@
    
     <case value="week">
       <include src="/packages/calendar/www/view-week-display" 
+      return_url="@return_url;noquote@"
       date="@current_date@"
       calendar_id_list=@list_of_calendar_ids@ 
       calendar_url="@calendar_url@"
@@ -54,9 +57,11 @@
 
     <case value="month">
       <include src="/packages/calendar/www/view-month-display"
+      return_url="@return_url;noquote@"
       date=@current_date@
       calendar_id_list=@list_of_calendar_ids@ 
       page_num=@page_num@
+      calendar_url="@calendar_url@"
     </case>
   </switch>
 </if>
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	11 Sep 2008 14:13:42 -0000	1.32
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	12 Sep 2008 16:13:01 -0000	1.33
@@ -38,6 +38,7 @@
     }
 }
 
+set return_url "[ns_conn url]?[ns_conn query]"
 set period_days [parameter::get -parameter ListView_DefaultPeriodDays -default 30]
 
 # get stuff out of the config array