Index: openacs-4/packages/content-includelet/lib/content-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/content-includelet/lib/content-includelet.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/content-includelet/lib/content-includelet.tcl	4 Mar 2009 03:00:44 -0000	1.3
+++ openacs-4/packages/content-includelet/lib/content-includelet.tcl	2 Dec 2009 23:35:51 -0000	1.4
@@ -18,10 +18,7 @@
     set item_id $content_id
 }
 
-# Note: we really need a way to set the priv to check for, and to change
-# perms on the content item...
-set edit_p [permission::permission_p -object_id $item_id -privilege admin]
-
+set edit_p [permission::permission_p -object_id $item_id -privilege write]
 if { $edit_p} {
     set package_url [site_node::get_url_from_object_id -object_id $package_id]
     set edit_url ${package_url}/admin?[export_vars -url {element_id item_id}]
@@ -33,6 +30,8 @@
 }
 
 if { $revision_id ne "" } { 
+    db_1row content {}
     set content \
-        [template::expand_percentage_signs [cr_write_content -string -revision_id $revision_id]]
+        [ad_html_text_convert -from $mime_type -to text/html -- \
+            [template::expand_percentage_signs $content]]
 }
Index: openacs-4/packages/content-includelet/lib/content-includelet.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/content-includelet/lib/content-includelet.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/content-includelet/lib/content-includelet.xql	2 Dec 2009 23:35:51 -0000	1.1
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<queryset>
+
+  <fullquery name="content">
+    <querytext>
+      select content, mime_type
+      from cr_revisions where revision_id = :revision_id
+    </querytext>
+  </fullquery>
+
+</queryset>