[Erp5-report] r14967 - /erp5/trunk/products/ERP5/Document/TextDocument.py

[nobody at svn.erp5.org]

Author: ivan
Date: Tue Jun 26 11:27:20 2007
New Revision: 14967

URL: http://svn.erp5.org?rev=14967&view=rev
Log:
Check if object has set text_content and call portal_transforms only if it's set. 


Modified:
    erp5/trunk/products/ERP5/Document/TextDocument.py

Modified: erp5/trunk/products/ERP5/Document/TextDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TextDocument.py?rev=14967&r1=14966&r2=14967&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TextDocument.py (original)
+++ erp5/trunk/products/ERP5/Document/TextDocument.py Tue Jun 26 11:27:20 2007
@@ -147,8 +147,17 @@
       src_mimetype = self.getTextFormat(DEFAULT_TEXT_FORMAT)
       if not src_mimetype.startswith('text/'):
         src_mimetype = 'text/%s' % src_mimetype
-      return mime_type, getToolByName(self, 'portal_transforms').convertTo(mime_type,
-                           self.getTextContent(), object=self, mimetype=src_mimetype)
+      # check if document has set text_content and convert if necessary
+      text_content = self.getTextContent()
+      if text_content is not None:
+        portal_transforms = getToolByName(self, 'portal_transforms')
+        return mime_type, portal_transforms.convertTo(mime_type,
+                                                      text_content, 
+                                                      object = self, 
+                                                      mimetype = src_mimetype)
+      else:
+        # text_content is not set, return empty string instead of None
+        return mime_type, ''
 
     def __call__(self):
       _setCacheHeaders(self, {})