diff MoinMoin/wikiutil.py @ 5474:a2128aa8b830

merge moin/1.7
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 01 Feb 2010 01:45:22 +0100
parents 10785c0fd48f bba0ab704aa9
children 575601b3117d
line wrap: on
line diff
--- a/MoinMoin/wikiutil.py	Sat Jan 09 02:40:08 2010 +0100
+++ b/MoinMoin/wikiutil.py	Mon Feb 01 01:45:22 2010 +0100
@@ -2496,6 +2496,16 @@
     ticket = "%s.%s.%s" % (tm, pagename, action)
     digest.update(ticket)
 
+    if request.session:
+        sid = request.session.name
+    else:
+        sid = 'None'
+    if request.user.valid:
+        uid = request.user.id
+    else:
+        uid = 'None'
+    digest.update(sid+uid)
+
     return "%s.%s" % (ticket, digest.hexdigest())