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

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv16201/CMFCore

Modified Files:
	CookieCrumbler.py 
Log Message:
- improved 'came_from' URL


=== Products/CMFCore/CookieCrumbler.py 1.31 => 1.32 ===
--- Products/CMFCore/CookieCrumbler.py:1.31	Sun Sep 19 09:30:05 2004
+++ Products/CMFCore/CookieCrumbler.py	Sun Sep 19 14:28:22 2004
@@ -327,7 +327,11 @@
             if page is not None:
                 came_from = req.get('came_from', None)
                 if came_from is None:
-                    came_from = req.get('URL', '')
+                    came_from = req.get('VIRTUAL_URL', None)
+                    if came_from is None:
+                        came_from = '%s%s%s' % ( req['SERVER_URL'].strip(),
+                                                 req['SCRIPT_NAME'].strip(),
+                                                 req['PATH_INFO'].strip() )
                     query = req.get('QUERY_STRING')
                     if query:
                         # Include the query string in came_from