Index: openacs-4/packages/news/lib/item.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/lib/item.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/news/lib/item.tcl	30 Sep 2013 10:51:35 -0000	1.3
+++ openacs-4/packages/news/lib/item.tcl	27 Oct 2014 16:41:46 -0000	1.4
@@ -1,5 +1,4 @@
-# /packages/news/www/item.tcl
-
+# /packages/news/lib/item.tcl
 ad_page_contract {
     
     Page to view one item (live or archived) in its active revision
@@ -9,7 +8,7 @@
     
 } {
 
-    item_id:integer,notnull
+    item_id:naturalnum,notnull
 
 } -properties {
     title:onevalue
@@ -36,18 +35,18 @@
 
 
 # live view of a news item in its active revision
-set item_exist_p [db_0or1row one_item "
+set item_exist_p [db_0or1row "" "
 select item_id,
        live_revision,
        publish_title,
        publish_lead,
-       html_p,
+       publish_format,
+       publish_body,
        publish_date,
        '<a href=\"/shared/community-member?user_id=' || creation_user || '\">' || item_creator ||  '</a>' as creator_link
 from   news_items_live_or_submitted
 where  item_id = :item_id"]
 
-
 if { $item_exist_p } {
 
     # workaround to get blobs with >4000 chars into a var, content.blob_to_string fails! 
@@ -63,7 +62,7 @@
     }
 
     # text-only body
-    if {[info exists html_p] && $html_p eq "f"} {
+    if {[info exists html_p] && $html_p == "f"} {
 	set publish_body [ad_text_to_html -- $publish_body]
     }
     
@@ -84,21 +83,21 @@
         set comments ""
     }
 
-    # get image info, if any
-    set image_id [news_get_image_id $item_id]
-    if {$image_id ne ""} {
-        set publish_image "image/$image_id"
-    } else {
-        set publish_image {}
-    }
+    set publish_image {}
+    # # get image info, if any
+    # set image_id [news_get_image_id $item_id]
+    # if {$image_id ne ""} {
+    #     set publish_image "image/$image_id"
+    # } else {
+    #     set publish_image {}
+    # }
 
     if {[permission::permission_p -object_id $item_id -privilege write] } {
         set edit_link "<a href=\"admin/revision-add?item_id=$item_id\">Revise</a>"
     } else {
         set edit_link ""
     }
 
-
     set title $publish_title
     set context [list $title]
     set publish_title {}