[Checkins] SVN: grok/trunk/ port fix from revision 85215

[Christian Theune]

Log message for revision 85806:
  port fix from revision 85215
  

Changed:
  U   grok/trunk/CHANGES.txt
  U   grok/trunk/src/grok/formlib.py

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2008-04-28 14:51:25 UTC (rev 85805)
+++ grok/trunk/CHANGES.txt	2008-04-28 14:52:14 UTC (rev 85806)
@@ -27,6 +27,9 @@
   fix was also made on Grok 0.12 in its online versions list after
   release.
 
+* Port fix of zope.formlib to correctly adapt the context to a FormField's
+  interface, not the field'
+
 0.12 (2008-04-22)
 =================
 

Modified: grok/trunk/src/grok/formlib.py
===================================================================
--- grok/trunk/src/grok/formlib.py	2008-04-28 14:51:25 UTC (rev 85805)
+++ grok/trunk/src/grok/formlib.py	2008-04-28 14:52:14 UTC (rev 85806)
@@ -86,7 +86,7 @@
     for form_field in form_fields:
         field = form_field.field
         # Adapt context, if necessary
-        interface = field.interface
+        interface = form_field.interface
         adapter = adapters.get(interface)
         if adapter is None:
             if interface is None: