Commit 64c7696e authored by Nicolas Delaby's avatar Nicolas Delaby

Fix condition, return original content only if format is empty and no parameters are passed.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45090 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent fd59563f
...@@ -269,7 +269,7 @@ class Image(TextConvertableMixin, File, OFSImage): ...@@ -269,7 +269,7 @@ class Image(TextConvertableMixin, File, OFSImage):
data = aq_base(data) data = aq_base(data)
self.setConversion(data, mime=mime_type, format=format) self.setConversion(data, mime=mime_type, format=format)
return mime_type, data return mime_type, data
if not (format and kw): if not (format or kw):
# User asked for original content # User asked for original content
return self.getContentType(), self.getData() return self.getContentType(), self.getData()
image_size = self.getSizeFromImageDisplay(kw.get('display')) image_size = self.getSizeFromImageDisplay(kw.get('display'))
......
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