Index: openacs-4/packages/xowiki/www/portlets/categories.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/categories.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/xowiki/www/portlets/categories.tcl 19 Jun 2006 00:40:04 -0000 1.14 +++ openacs-4/packages/xowiki/www/portlets/categories.tcl 28 Jun 2006 00:32:16 -0000 1.15 @@ -44,7 +44,9 @@ $cattree($plevel) add $c set category($category_id) $c lappend categories $category_id - } + #set itemobj [Object new -set name en:index -set title MyTitle -set prefix "" -set suffix ""] + #$cattree(0) add_to_category -category $c -itemobj $itemobj -orderby title + } set sql "category_object_map c, cr_items ci, cr_revisions r, xowiki_page p \ where c.object_id = ci.item_id and ci.parent_id = $folder_id \ Index: openacs-4/packages/xowiki/www/portlets/weblog.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/weblog.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/xowiki/www/portlets/weblog.tcl 19 Jun 2006 00:40:04 -0000 1.3 +++ openacs-4/packages/xowiki/www/portlets/weblog.tcl 28 Jun 2006 00:32:17 -0000 1.4 @@ -83,7 +83,8 @@ -order_clause "order by p.publish_date desc" \ -page_number $page_number -page_size $page_size \ -extra_from_clause $extra_from_clause \ - -extra_where_clause "and ci.item_id != [$including_page set item_id] $date_clause \ + -extra_where_clause "and ci.item_id != [$including_page set item_id] \ + and ci.name != '::$folder_id' $date_clause \ and ci.content_type not in ('::xowiki::PageTemplate') $extra_where_clause" ] set my_nr_items [db_string count [eval ::xowiki::Page select_query $query -count true]]