Commit 7f52c73b authored by Ivan Tyagov's avatar Ivan Tyagov

Fix a bug that return content-type twice which created a mismatched API and bad text conversion.

This is now done by asTextContent().


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22813 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 929d6e21
...@@ -388,7 +388,7 @@ class OOoDocument(PermanentURLMixIn, File, ConversionCacheMixin): ...@@ -388,7 +388,7 @@ class OOoDocument(PermanentURLMixIn, File, ConversionCacheMixin):
if 'enc.txt' in format_list: if 'enc.txt' in format_list:
format = 'enc.txt' format = 'enc.txt'
elif format not in format_list: elif format not in format_list:
return 'text/plain', self.asTextContent() return self.asTextContent()
# Raise an error if the format is not supported # Raise an error if the format is not supported
if not self.isTargetFormatAllowed(format): if not self.isTargetFormatAllowed(format):
raise ConversionError("OOoDocument: target format %s is not supported" % format) raise ConversionError("OOoDocument: target format %s is not supported" % format)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment