Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl,v diff -u -N -r1.30.2.1 -r1.30.2.2 --- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl 7 Mar 2008 23:34:26 -0000 1.30.2.1 +++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl 18 Apr 2008 21:16:11 -0000 1.30.2.2 @@ -282,8 +282,8 @@ content::get_content $content_type -if { !\[string equal -length 4 \"text\" \$content(mime_type)\] } { - \# It's a file. +if { !\[string equal \"text/html\" \$content(mime_type)\] && !\[ad_html_text_convertable_p -from \$content(mime_type) -to text/html\] } { + \# don't render its content cr_write_content -revision_id \$content(revision_id) ad_script_abort } @@ -293,7 +293,7 @@ set text \[cr_write_content -string -revision_id \$revision_id\] if { !\[string equal \"text/html\" \$content(mime_type)\] } { - set text \[ad_html_text_convert -from \$mime_type -to text/html -- \$text\] + set text \[ad_html_text_convert -from \$content(mime_type) -to text/html -- \$text\] } set context \[list \$title\]