Index: openacs-4/packages/news/tcl/news-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs.tcl,v diff -u -r1.28 -r1.29 --- openacs-4/packages/news/tcl/news-procs.tcl 9 Nov 2008 23:29:28 -0000 1.28 +++ openacs-4/packages/news/tcl/news-procs.tcl 28 Apr 2009 09:49:11 -0000 1.29 @@ -386,31 +386,34 @@ } { set package_id [ad_conn package_id] + set node_id [ad_conn node_id] + set instance_name [application_group::closest_ancestor_element -include_self -node_id $node_id -element "instance_name"] + # get the title and teaser for latest news item for the given package id if { [db_0or1row "get_news" "select item_id, publish_date, publish_title as title, publish_lead as lead, publish_body as body,html_p from news_items_live_or_submitted where news_id = :news_id"] } { set new_content "$title\n\n$lead" - set html_content [ad_html_text_convert "$title\n\n$lead"] - if {$html_p} { - append new_content "\n\n[ad_html_text_convert -from text/html -to text/plain $body]" - append html_content "

$body" - } else { - append new_content "\n\n$body" - append html_content "

[ad_html_text_convert "$body"]" - } + set html_content [ad_html_text_convert "$title\n\n$lead"] + if {$html_p} { + append new_content "\n\n[ad_html_text_convert -from text/html -to text/plain $body]" + append html_content "

$body" + } else { + append new_content "\n\n$body" + append html_content "

[ad_html_text_convert "$body"]" + } append new_content "\n\n[string repeat - 70]" append new_content "\n\n[parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][news_util_get_url $news_package_id]]item?item_id=$item_id \n\n" - append html_content "


[ad_html_text_convert "\n [parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][news_util_get_url $news_package_id]item?item_id=$item_id"]

" + append html_content "


[ad_html_text_convert "\n [parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][news_util_get_url $news_package_id]item?item_id=$item_id"]

" } # Notifies the users that requested notification for the specific news item notification::new \ -type_id [notification::type::get_type_id -short_name one_news_item_notif] \ -object_id $news_package_id \ - -notif_subject "Latest News" \ + -notif_subject "\[$instance_name\] #news.Latest_News#" \ -notif_text $new_content \ - -notif_html $html_content \ + -notif_html $html_content \ -notif_date $publish_date }