[Erp5-report] r45090 nicolas - /erp5/trunk/products/ERP5/Document/Image.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Apr  5 15:08:39 2011
New Revision: 45090

URL: http://svn.erp5.org?rev=45090&view=rev
Log:
Fix condition, return original content only if format is empty and no parameters are passed.


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

Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=45090&r1=45089&r2=45090&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Tue Apr  5 15:08:39 2011
@@ -269,7 +269,7 @@ class Image(TextConvertableMixin, File, 
         data = aq_base(data)
         self.setConversion(data, mime=mime_type, format=format)
         return mime_type, data
-    if not (format and kw):
+    if not (format or kw):
       # User asked for original content
       return self.getContentType(), self.getData()
     image_size = self.getSizeFromImageDisplay(kw.get('display'))