Index: openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl	1 Oct 2017 12:16:05 -0000	1.9
+++ openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl	29 Jan 2018 11:03:25 -0000	1.10
@@ -44,14 +44,15 @@
 ad_proc -public template::util::richtext_or_file::formats {} {
     Returns a list of valid richtext_or_file formats
 } {
-    return { text/enhanced text/plain text/html text/fixed-width }
+    return { text/enhanced text/markdown text/plain text/html text/fixed-width }
 }
 
 ad_proc -public template::util::richtext_or_file::format_options {} {
     Returns a formatting option list
 } {
-    return { 
+    return {
         {"Enhanced Text" text/enhanced}
+        {"Markdown Text" text/markdown}
         {"Plain Text" text/plain}
         {"Fixed-width Text" text/fixed-width}
         {"HTML" text/html}
@@ -87,7 +88,7 @@
     }
 
     # enhanced text and HTML needs to be security checked
-    if { [lsearch { text/enhanced text/html } $mime_type] == -1 } {
+    if { $mime_type in { text/enhanced text/html } } {
         set check_result [ad_html_security_check $text]
         if { $check_result ne "" } {
             set message $check_result