r13497 - in Products.PortalTransforms/branches/1.6: . Products/PortalTransforms

Author: davisagli
Date: Sat Feb 26 23:19:34 2011
New Revision: 13497

Modified:
   Products.PortalTransforms/branches/1.6/   (props changed)
   Products.PortalTransforms/branches/1.6/Products/PortalTransforms/TransformEngine.py
Log:
merge r13496 from trunk

Modified: Products.PortalTransforms/branches/1.6/Products/PortalTransforms/TransformEngine.py
==============================================================================
--- Products.PortalTransforms/branches/1.6/Products/PortalTransforms/TransformEngine.py	(original)
+++ Products.PortalTransforms/branches/1.6/Products/PortalTransforms/TransformEngine.py	Sat Feb 26 23:19:34 2011
@@ -88,7 +88,7 @@
         if name in self.objectIds():
             self._delObject(name)
 
-    security.declarePrivate('convertTo')
+    security.declarePublic('convertTo')
     def convertTo(self, target_mimetype, orig, data=None, object=None,
                   usedby=None, context=None, **kwargs):
         """Convert orig to a given mimetype
@@ -190,6 +190,8 @@
 
         # return idatastream object
         return result
+    # make sure it's not publishable (XSS risk)
+    del convertTo.__doc__
 
     security.declarePublic('convertToData')
     def convertToData(self, target_mimetype, orig, data=None, object=None,

------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in 
Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business 
insights. http://p.sf.net/sfu/splunk-dev2dev