Index: openacs-4/packages/news-portlet/www/news-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.tcl,v
diff -u -N -r1.17.2.2 -r1.17.2.3
--- openacs-4/packages/news-portlet/www/news-portlet.tcl	24 Sep 2005 05:00:56 -0000	1.17.2.2
+++ openacs-4/packages/news-portlet/www/news-portlet.tcl	26 Sep 2005 08:05:00 -0000	1.17.2.3
@@ -41,26 +41,25 @@
 set list_of_package_ids $config(package_id)
 set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
 
-db_multirow -extend { publish_date view_url rss_exists rss_url notification_chunk} news_items select_news_items {} {
-    set display_item_content_p [parameter::get_from_package_key -package_key news-portlet -parameter display_item_content_p -default 0]
-    set display_subgroup_items_p [parameter::get_from_package_key -package_key news-portlet -parameter display_subgroup_items_p -default 0]
-    
-    set display_item_attribution_p [parameter::get_from_package_key -package_key news-portlet -parameter display_item_attribution_p -default 1]
-    
-    if { $inside_comm_p && $display_subgroup_items_p } {
-	db_foreach select_subgroup_package_ids {} {
-	    set one_instance_p 0
-	    lappend list_of_package_ids $package_id
-	}
+set display_item_content_p [parameter::get_from_package_key -package_key news-portlet -parameter display_item_content_p -default 0]
+set display_subgroup_items_p [parameter::get_from_package_key -package_key news-portlet -parameter display_subgroup_items_p -default 0]
+set display_item_attribution_p [parameter::get_from_package_key -package_key news-portlet -parameter display_item_attribution_p -default 1]
+
+if { $inside_comm_p && $display_subgroup_items_p } {
+    db_foreach select_subgroup_package_ids {} {
+        set one_instance_p 0
+        lappend list_of_package_ids $package_id
     }
-    
-    if { $display_item_content_p } {
-	#Only pull out the full content if we have to.
-	set content_column " , content as publish_body, html_p "
-    } else {
-	set content_column ""
-    }
-    
+}
+
+if { $display_item_content_p } {
+    #Only pull out the full content if we have to.
+    set content_column " , content as publish_body, html_p "
+} else {
+    set content_column ""
+}
+
+db_multirow -extend { publish_date view_url rss_exists rss_url notification_chunk} news_items select_news_items {} {
     set publish_date [lc_time_fmt $publish_date_ansi "%x"]
     set view_url [export_vars -base "${url}item" { item_id }]
     set rss_exists [rss_support::subscription_exists -summary_context_id $package_id -impl_name news]
@@ -75,4 +74,4 @@
     if { $display_item_attribution_p } {
         set creator_url [acs_community_member_url -user_id $creation_user]
     }
-}
\ No newline at end of file
+}