[Archetypes-checkins] r9479 - Products.Archetypes/trunk/Products/Archetypes

[Hanno S. <svn...@pl...>]

Author: hannosch
Date: Mon Mar 24 20:42:40 2008
New Revision: 9479

Modified:
   Products.Archetypes/trunk/Products/Archetypes/Field.py
   Products.Archetypes/trunk/Products/Archetypes/HISTORY.txt
Log:
Merged c9478 from the 1.5 branch


Modified: Products.Archetypes/trunk/Products/Archetypes/Field.py
==============================================================================
--- Products.Archetypes/trunk/Products/Archetypes/Field.py	(original)
+++ Products.Archetypes/trunk/Products/Archetypes/Field.py	Mon Mar 24 20:42:40 2008
@@ -1176,7 +1176,8 @@
             return ''
 
         f = self.get(instance)
-        
+
+        datastream = ''
         try:
             datastream = transforms.convertTo(
                 "text/plain",

Modified: Products.Archetypes/trunk/Products/Archetypes/HISTORY.txt
==============================================================================
--- Products.Archetypes/trunk/Products/Archetypes/HISTORY.txt	(original)
+++ Products.Archetypes/trunk/Products/Archetypes/HISTORY.txt	Mon Mar 24 20:42:40 2008
@@ -4,6 +4,10 @@
 1.5.8 - unreleased
 ==================
 
+  * Fixed NameError in Field.py when an error occurs in a transform. This
+    closes http://dev.plone.org/plone/ticket/7905.
+    [hannosch, sidnei]
+
   * Add a new preview_scale property to ImageWidget. This is used by the edit
     view when showing the image. If the scale is not present the previous
     logic (only show if the image is <100kB in size) is used.