[CMF-checkins] CVS: CMF/CMFCore - MembershipTool.py:1.34

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv32699/CMFCore

Modified Files:
	MembershipTool.py 
Log Message:
Merged yuppie-collector162-branch:
- Fixed member area Ownership and Roles. (Collector #162)

=== CMF/CMFCore/MembershipTool.py 1.33 => 1.34 ===
--- CMF/CMFCore/MembershipTool.py:1.33	Fri May  9 11:04:18 2003
+++ CMF/CMFCore/MembershipTool.py	Wed May 28 06:57:41 2003
@@ -263,11 +263,10 @@
             f.manage_permission(AccessContentsInformation,
                                 ['Owner','Manager','Reviewer'], 0)  
 
-            # Grant ownership to Member
-            try: f.changeOwnership(user)
-            except AttributeError: pass  # Zope 2.1.x compatibility
+            # Grant Ownership and Owner role to Member
+            f.changeOwnership(user)
+            f.__ac_local_roles__ = None
             f.manage_setLocalRoles(member_id, ['Owner'])
-
 
     security.declarePublic('isAnonymousUser')
     def isAnonymousUser(self):