[CMF-checkins] CVS: Products/CMFCore - CookieCrumbler.py:1.30.2.2
Yvo Schubbe
y.2004_ at wcm-solutions.de
Sun Sep 19 14:28:24 EDT 2004
Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv15925/CMFCore
Modified Files:
Tag: CMF-1_5-branch
CookieCrumbler.py
Log Message:
- improved 'came_from' URL
=== Products/CMFCore/CookieCrumbler.py 1.30.2.1 => 1.30.2.2 ===
--- Products/CMFCore/CookieCrumbler.py:1.30.2.1 Sun Sep 19 09:29:45 2004
+++ Products/CMFCore/CookieCrumbler.py Sun Sep 19 14:27:54 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
More information about the CMF-checkins
mailing list