[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py - call getSecurityManager().getUser() directly

[Yvo Schubbe]

Log message for revision 120413:
  - call getSecurityManager().getUser() directly

Changed:
  UU  Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py	2011-02-17 12:57:23 UTC (rev 120412)
+++ Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py	2011-02-17 12:57:42 UTC (rev 120413)
@@ -11,11 +11,10 @@
 #
 ##############################################################################
 """ CMFDefault portal_membership tool.
-
-$Id$
 """
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
+from AccessControl.SecurityManagement import getSecurityManager
 from Acquisition import aq_base
 from Acquisition import aq_inner
 from Acquisition import aq_parent
@@ -25,7 +24,6 @@
 
 from Products.CMFCore.MembershipTool import MembershipTool as BaseTool
 from Products.CMFCore.utils import _checkPermission
-from Products.CMFCore.utils import _getAuthenticatedUser
 from Products.CMFDefault.Document import addDocument
 from Products.CMFDefault.interfaces import IMembershipTool
 from Products.CMFDefault.permissions import ListPortalMembers
@@ -125,7 +123,7 @@
             return None
         # Note: We can't use getAuthenticatedMember() and getMemberById()
         # because they might be wrapped by MemberDataTool.
-        user = _getAuthenticatedUser(self)
+        user = getSecurityManager().getUser()
         user_id = user.getId()
         if member_id in ('', user_id):
             member = user


Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision