[Plone-cvs] r20201 - in Products.CMFPlone/trunk/Products/CMFPlone: . profiles/default

[Hanno S. <svn...@pl...>]

Author: hannosch
Date: Mon Mar 31 12:14:19 2008
New Revision: 20201

Modified:
   Products.CMFPlone/trunk/Products/CMFPlone/HISTORY.txt
   Products.CMFPlone/trunk/Products/CMFPlone/profiles/default/propertiestool.xml
Log:
Mime type text/x-html-captioned was added to the forbidden list of types. This closes #7943.


Modified: Products.CMFPlone/trunk/Products/CMFPlone/HISTORY.txt
==============================================================================
--- Products.CMFPlone/trunk/Products/CMFPlone/HISTORY.txt	(original)
+++ Products.CMFPlone/trunk/Products/CMFPlone/HISTORY.txt	Mon Mar 31 12:14:19 2008
@@ -4,6 +4,10 @@
     
 Plone 4.0 - UNRELEASED
 
+    - Mime type text/x-html-captioned was added to the forbidden list of types.
+      This closes http://dev.plone.org/plone/ticket/7943.
+      [hannosch, duncan]
+
     - Moved all icons for real actions from the action icons tool to the
       actions themselves.
       [hannosch]

Modified: Products.CMFPlone/trunk/Products/CMFPlone/profiles/default/propertiestool.xml
==============================================================================
--- Products.CMFPlone/trunk/Products/CMFPlone/profiles/default/propertiestool.xml	(original)
+++ Products.CMFPlone/trunk/Products/CMFPlone/profiles/default/propertiestool.xml	Mon Mar 31 12:14:19 2008
@@ -120,6 +120,7 @@
    <element value="text/x-web-markdown"/>
    <element value="text/x-web-intelligent"/>
    <element value="text/x-web-textile"/>
+   <element value="text/x-html-captioned"/>
   </property>
   <property name="default_contenttype" type="string">text/html</property>
   <property name="enable_sitemap" type="boolean">False</property>