Index: openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/weblog-mini-calendar.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl 14 Sep 2008 17:31:38 -0000 1.14 +++ openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl 17 Jun 2010 10:45:12 -0000 1.15 @@ -1,12 +1,12 @@ ::xo::Page requireCSS "/resources/calendar/calendar.css" set package_id [::xo::cc package_id] -set folder_id [$__including_page set parent_id] +set parent_id [$__including_page set parent_id] set including_item_id [$__including_page set item_id] if {![exists_and_not_null base_url]} { if {![info exists page]} {set page [$package_id get_parameter weblog_page]} - set base_url [$package_id pretty_link $page] + set base_url [$package_id pretty_link -parent_id $parent_id $page] } set date [ns_queryget date] @@ -50,7 +50,7 @@ } set innersql "from xowiki_pagei p, cr_items ci \ - where ci.parent_id = $folder_id \ + where ci.parent_id = $parent_id \ and ci.item_id = p.item_id and ci.live_revision = p.page_id \ and ci.content_type not in ('::xowiki::PageTemplate', '::xowiki::Form') \ and ci.item_id != $including_item_id \