← Back to branch summary

~ubuntu-branches/ubuntu/natty/moin/natty-security

« back to all changes in this revision

Viewing changes to MoinMoin/action/login.py

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2010-08-11 12:35:34 UTC
  • mfrom: (0.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20100811123534-q8zu7qrwqul6cvec
Tags: 1.9.3-1ubuntu1
https://launchpad.net/bugs/586518
* Merge from Debian unstable (LP: #586518). Based on work by Stefan Ebner.
  Remaining changes:
 - Remove python-xml from Suggests field, the package isn't anymore in
   sys.path.
 - Demote fckeditor from Recommends to Suggests; the code was previously
   embedded in moin, but it was also disabled, so there's no reason 
   for us to pull this in by default currently. Note: fckeditor has a
   number of security problems and so this change probably needs to be
   carried indefinitely.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MoinMoin/action/login.py
10
10
    @license: GNU GPL, see COPYING for details.
11
11
"""
12
12
 
13
 
from MoinMoin import userform
 
13
from MoinMoin import userform, wikiutil
14
14
from MoinMoin.Page import Page
15
15
from MoinMoin.widget import html
16
16
 
66
66
                return self.handle_multistage()
67
67
            if hasattr(request, '_login_messages'):
68
68
                for msg in request._login_messages:
69
 
                    request.theme.add_msg(msg, "error")
 
69
                    request.theme.add_msg(wikiutil.escape(msg), "error")
70
70
            return self.page.send_page()
71
71
 
72
72
        else: # show login form