changeset 5318:5dc9e1f2a640

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 28 Nov 2009 23:54:43 +0100
parents c3316c25365c (current diff) 5060bec6a284 (diff)
children 6986a4c845c8
files
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/login.py	Sat Nov 28 23:54:10 2009 +0100
+++ b/MoinMoin/action/login.py	Sat Nov 28 23:54:43 2009 +0100
@@ -15,7 +15,11 @@
 from MoinMoin.widget import html
 
 def execute(pagename, request):
-    return LoginHandler(pagename, request).handle()
+    if request.user.valid:
+        url = Page(request, pagename).url(request)
+        request.http_redirect(url)
+    else:
+        return LoginHandler(pagename, request).handle()
 
 class LoginHandler:
     def __init__(self, pagename, request):
--- a/MoinMoin/xmlrpc/__init__.py	Sat Nov 28 23:54:10 2009 +0100
+++ b/MoinMoin/xmlrpc/__init__.py	Sat Nov 28 23:54:43 2009 +0100
@@ -531,7 +531,7 @@
         """
 
         pagename = self._instr(pagename)
-
+        pagename = wikiutil.normalize_pagename(pagename, self.cfg)
         if not pagename:
             return xmlrpclib.Fault("INVALID", "pagename can't be empty")