[Zope-CVS] CVS: Products/CookieCrumbler - CHANGES.txt:1.4 CookieCrumbler.py:1.6

[Shane Hathaway]

Update of /cvs-repository/Products/CookieCrumbler
In directory cvs.zope.org:/tmp/cvs-serv27994

Modified Files:
	CHANGES.txt CookieCrumbler.py 
Log Message:
Made sure inner cookie crumblers can override the logout form.


=== Products/CookieCrumbler/CHANGES.txt 1.3 => 1.4 ===
   on.  Actually, the enabling of local paths was reversed from what the
   checkbox label implied, doubling the confusion.
+
+- Made sure inner cookie crumblers can override the logout form.
+


=== Products/CookieCrumbler/CookieCrumbler.py 1.5 => 1.6 ===
                         self.delRequestVar(req, self.auth_cookie)
                         return ATTEMPT_RESUME
-            return ATTEMPT_NONE
+            if getattr(req, '_cookie_auth', 0):
+                # A higher cookie crumbler already did the work of
+                # moving the cookie to _auth, but the inner CC
+                # should have the opportunity to override logout forms, etc.
+                return ATTEMPT_RESUME
+            else:
+                return ATTEMPT_NONE
 
     def __call__(self, container, req):
         '''The __before_publishing_traverse__ hook.'''