[Zope-Checkins] SVN: Zope/branches/2.11/ - hook up ZopeVocabularyRegistry

[Yvo Schubbe]

Log message for revision 85826:
  - hook up ZopeVocabularyRegistry

Changed:
  U   Zope/branches/2.11/doc/CHANGES.txt
  U   Zope/branches/2.11/lib/python/Products/Five/__init__.py

-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.11/doc/CHANGES.txt	2008-04-28 17:26:06 UTC (rev 85825)
+++ Zope/branches/2.11/doc/CHANGES.txt	2008-04-28 18:13:22 UTC (rev 85826)
@@ -8,6 +8,9 @@
 
     Bugs Fixed
 
+      - Products.Five: Fixed vocabulary lookup broken in 2.11 beta 1.
+        ZopeVocabularyRegistry wasn't hooked up on startup.
+
       - Launchpad #143813: zopectl now exits non-zero when
         child processes fail.
 

Modified: Zope/branches/2.11/lib/python/Products/Five/__init__.py
===================================================================
--- Zope/branches/2.11/lib/python/Products/Five/__init__.py	2008-04-28 17:26:06 UTC (rev 85825)
+++ Zope/branches/2.11/lib/python/Products/Five/__init__.py	2008-04-28 18:13:22 UTC (rev 85826)
@@ -22,6 +22,9 @@
 from Products.Five.browser import BrowserView
 from Products.Five.skin.standardmacros import StandardMacros
 
+# hook up ZopeVocabularyRegistry
+import zope.app.schema.vocabulary
+
 # load the site's ZCML tree (usually site.zcml) upon product
 # initialization
 def initialize(context):