Index: openacs-4/packages/calendar/www/navbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/navbar.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/calendar/www/navbar.tcl	27 Oct 2014 16:41:08 -0000	1.5
+++ openacs-4/packages/calendar/www/navbar.tcl	27 Jun 2015 19:21:36 -0000	1.6
@@ -29,7 +29,7 @@
 }
 
 if { [string match "/dotlrn*" $base_url] } {
-    set link "[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print"
+    set link "[export_vars -base $base_url -entire_form -exclude {export}]&export=print"
 } else {
     set link "[export_vars -base $base_url {date {view day}}]&export=print"
 }
Index: openacs-4/packages/calendar/www/view-list-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v
diff -u -N -r1.34 -r1.35
--- openacs-4/packages/calendar/www/view-list-display.tcl	27 Oct 2014 16:41:08 -0000	1.34
+++ openacs-4/packages/calendar/www/view-list-display.tcl	27 Jun 2015 19:21:36 -0000	1.35
@@ -62,7 +62,7 @@
 
 set view list
 set form_vars [export_vars -form -entire_form -exclude {period_days}]
-set url_vars [export_vars -url -entire_form -exclude {period_days}]
+set url_vars [export_vars -entire_form -exclude {period_days}]
 
 multirow create items \
     event_name \
Index: openacs-4/packages/calendar/www/view-week-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v
diff -u -N -r1.26 -r1.27
--- openacs-4/packages/calendar/www/view-week-display.tcl	27 Oct 2014 16:41:09 -0000	1.26
+++ openacs-4/packages/calendar/www/view-week-display.tcl	27 Jun 2015 19:21:36 -0000	1.27
@@ -273,7 +273,7 @@
 
 multirow create days_of_week width day_short monthday weekday_date weekday_url day_num
 
-set nav_url_base [ad_conn url]?[export_vars -url -entire_form -exclude {date view}]
+set nav_url_base [export_vars -base [ad_conn url] -entire_form -exclude {date view}]
 
 for {set i 0} {$i < 7} {incr i} {
     set weekday_secs [expr {$first_weekday_date_secs + ($i*86400)}]