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

[Christian Theune]

Log message for revision 85812:
  port fix from revision 85215
  

Changed:
  U   grok/branches/0.12/CHANGES.txt
  U   grok/branches/0.12/src/grok/formlib.py

-=-
Modified: grok/branches/0.12/CHANGES.txt
===================================================================
--- grok/branches/0.12/CHANGES.txt	2008-04-28 14:58:00 UTC (rev 85811)
+++ grok/branches/0.12/CHANGES.txt	2008-04-28 14:58:53 UTC (rev 85812)
@@ -1,6 +1,15 @@
 Grok changes
 ************
 
+0.12.1 (????-??-??)
+===================
+
+Bug fixes
+---------
+
+* Port fix of zope.formlib to correctly adapt the context to a FormField's
+  interface, not the field'
+
 0.12 (2008-04-22)
 =================
 
@@ -72,6 +81,7 @@
 * Fix https://bugs.launchpad.net/grok/+bug/162437: grok.Form and its
   subclasses did not implement IBrowserView.
 
+<<<<<<< .working
 * Fix https://bugs.launchpad.net/grok/+bug/185414: grok introspector
   was broken for zipped eggs.
 

Modified: grok/branches/0.12/src/grok/formlib.py
===================================================================
--- grok/branches/0.12/src/grok/formlib.py	2008-04-28 14:58:00 UTC (rev 85811)
+++ grok/branches/0.12/src/grok/formlib.py	2008-04-28 14:58:53 UTC (rev 85812)
@@ -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: