[CMF-checkins] CVS: CMF/CMFCore - CookieCrumbler.py:1.20

[Evan Simpson]

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

Modified Files:
	CookieCrumbler.py 
Log Message:
Fix Collector #153: CookieCrumbler didn't preserve query strings.


=== CMF/CMFCore/CookieCrumbler.py 1.19 => 1.20 ===
--- CMF/CMFCore/CookieCrumbler.py:1.19	Mon Apr 28 17:11:13 2003
+++ CMF/CMFCore/CookieCrumbler.py	Fri Jun 13 14:13:30 2003
@@ -231,6 +231,8 @@
                 came_from = req.get('came_from', None)
                 if came_from is None:
                     came_from = req['URL']
+                    if req.get('QUERY_STRING'):
+                        came_from = '%s?%s' % (came_from, req['QUERY_STRING'])
                 url = '%s?came_from=%s&retry=%s&disable_cookie_login__=1' % (
                     page.absolute_url(), quote(came_from), retry)
                 return url