Index: openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl,v diff -u -N -r1.18.2.9 -r1.18.2.10 --- openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl 2 May 2017 13:51:25 -0000 1.18.2.9 +++ openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl 3 May 2017 07:12:52 -0000 1.18.2.10 @@ -4,13 +4,15 @@ set parent_id [$__including_page set parent_id] set including_item_id [$__including_page set item_id] -if {(![info exists base_url] || $base_url eq "")} { - if {![info exists page]} {set page [$package_id get_parameter weblog_page]} - set base_url [$package_id pretty_link -parent_id $parent_id $page] +if {![info exists base_url] || $base_url eq ""} { + if {![info exists page]} { + set page [$package_id get_parameter weblog_page] + } + set base_url [$package_id pretty_link -parent_id $parent_id -path_encode false $page] } set date [ns_queryget date] -if {(![info exists date] || $date eq "")} { +if {$date eq ""} { set date [dt_sysdate] } @@ -84,13 +86,13 @@ set prev_month_url "" } else { set prev_month [clock format $prev_mon -format "%Y-%m-%d"] - set prev_month_url [export_vars -no_base_encode -base $base_url {{date $prev_month} page_num summary}] + set prev_month_url [export_vars -base $base_url {{date $prev_month} page_num summary}] } if {$next_mon > [clock scan $latest_date]} { set next_month_url "" } else { set next_month [clock format $next_mon -format "%Y-%m-%d"] - set next_month_url [export_vars -no_base_encode -base $base_url {{date $next_month} page_num summary}] + set next_month_url [export_vars -base $base_url {{date $next_month} page_num summary}] } @@ -154,7 +156,7 @@ } else { set class inactive } - set url [export_vars -no_base_encode -base $base_url {{date $ansi_date} summary}] + set url [export_vars -base $base_url {{date $ansi_date} summary}] set id minicalendar-$ansi_date if {$count ne ""} { @@ -179,7 +181,7 @@ set sysdate [dt_sysdate] -set today_url [export_vars -no_base_encode -base $base_url {{date $sysdate} page_num}] +set today_url [export_vars -base $base_url {{date $sysdate} page_num}] if {$sysdate eq $date} { set today_p t } else {