[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py - reverted r122789

[Yvo Schubbe]

Log message for revision 122791:
  - reverted r122789

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py	2011-09-13 14:39:00 UTC (rev 122790)
+++ Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py	2011-09-13 14:48:33 UTC (rev 122791)
@@ -23,7 +23,6 @@
 from OFS.PropertyManager import PropertyManager
 from OFS.SimpleItem import SimpleItem
 from zope.component import getUtility
-from zope.component.interfaces import ComponentLookupError
 from zope.i18nmessageid import Message
 from zope.interface import implements
 
@@ -573,11 +572,7 @@
 
     def __init__( self, tool, folder, object=None ):
         self.portal = portal = aq_parent(aq_inner(tool))
-        try:
-            mtool = getUtility(IMembershipTool)
-        except ComponentLookupError:
-            # BBB: fallback for CMF 2.2 instances
-            mtool = getToolByName(tool, 'portal_membership')
+        mtool = getUtility(IMembershipTool)
         self.isAnonymous = mtool.isAnonymousUser()
         self.user_id = mtool.getAuthenticatedMember().getId()
         self.portal_url = portal.absolute_url()