Index: openacs.org-dev/www/templates/widgets/news.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/news.tcl,v diff -u -r1.5 -r1.6 --- openacs.org-dev/www/templates/widgets/news.tcl 8 Nov 2002 01:13:03 -0000 1.5 +++ openacs.org-dev/www/templates/widgets/news.tcl 8 Nov 2002 01:26:15 -0000 1.6 @@ -8,7 +8,7 @@ news_items:multirow } -set n_news_items 10 +set n_news_items 6 set news_limit [expr $n_news_items + 1] set max_post_age_days 60 @@ -20,7 +20,7 @@ from news_items_approved --where package_id = 43787 --where package_id = 3147 - and publish_date < current_timestamp +where publish_date < current_timestamp and (archive_date is null or archive_date > current_timestamp) order by publish_date desc, item_id desc limit $news_limit