Index: openacs-4/packages/news/www/item-create-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create-3.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/news/www/item-create-3.tcl	22 Dec 2009 22:24:02 -0000	1.11
+++ openacs-4/packages/news/www/item-create-3.tcl	26 Dec 2009 23:27:56 -0000	1.12
@@ -10,7 +10,7 @@
     @cvs-id $Id$
 } {
     publish_title:notnull
-    publish_body:notnull,html,trim
+    publish_body:notnull,trim
     publish_body.format:notnull,trim
     {publish_lead {}}
     {publish_date_ansi:trim "[db_null]"}
Index: openacs-4/packages/news/www/item-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/news/www/item-create.tcl	22 Dec 2009 22:24:02 -0000	1.8
+++ openacs-4/packages/news/www/item-create.tcl	26 Dec 2009 23:27:56 -0000	1.9
@@ -12,7 +12,7 @@
 } {
     {publish_title {}}
     {publish_lead {}}
-    {publish_body:html {}}
+    {publish_body {}}
     {publish_body.format {}}
     {publish_date_ansi {now}}
     {archive_date_ansi {}}
Index: openacs-4/packages/news/www/preview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.tcl,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/news/www/preview.tcl	22 Dec 2009 22:24:02 -0000	1.21
+++ openacs-4/packages/news/www/preview.tcl	26 Dec 2009 23:27:56 -0000	1.22
@@ -11,7 +11,7 @@
     action:notnull,trim
     publish_title:notnull,trim
     {publish_lead {}}
-    {publish_body:html,trim ""}
+    {publish_body:trim ""}
     publish_body.format:notnull
     {revision_log: ""}
     text_file:optional
@@ -31,6 +31,17 @@
 
 } -validate {
 
+    content_html -requires {publish_body publish_body.format} {
+        if { ${publish_body.format} eq "text/html" || 
+             ${publish_body.format} eq "text/enhanced" } {
+            set complaint [ad_html_security_check $publish_body]
+            if { ![empty_string_p $complaint] } {
+                ad_complain $complaint
+		return
+            }
+        }
+    }
+
     check_revision_log -requires {action revision_log} {
 	if { ![string match $action "News Item"] && [empty_string_p $revision_log]} {
 	    ad_complain "[_ news.lt_You_must_supply_a_rev]"
Index: openacs-4/packages/news/www/admin/revision-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-add-3.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/news/www/admin/revision-add-3.tcl	22 Dec 2009 22:24:02 -0000	1.8
+++ openacs-4/packages/news/www/admin/revision-add-3.tcl	26 Dec 2009 23:27:56 -0000	1.9
@@ -13,7 +13,7 @@
     item_id:integer
     publish_title:notnull
     publish_lead
-    publish_body:notnull,html,trim
+    publish_body:notnull,trim
     publish_body.format:notnull
     revision_log:notnull
     publish_date_ansi:notnull
Index: openacs-4/packages/news/www/admin/revision-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-add.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/news/www/admin/revision-add.tcl	22 Dec 2009 22:24:02 -0000	1.8
+++ openacs-4/packages/news/www/admin/revision-add.tcl	26 Dec 2009 23:27:56 -0000	1.9
@@ -23,7 +23,7 @@
     publish_title:onevalue
     publish_lead:onevalue
     publish_body:onevalue
-    html_p:onevalue
+    publish_format:onevalue
     archive_date:onevalue
     never_checkbox:onevalue
     hidden_vars:onevalue