← Back to branch summary

~ubuntu-branches/ubuntu/precise/moin/precise-updates

« back to all changes in this revision

Viewing changes to MoinMoin/action/backup.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/backup.py
80
80
    request.theme.send_footer(pagename)
81
81
    request.theme.send_closing_html()
82
82
 
83
 
 
 
83
# NOTE: consider using ActionBase.render_msg instead of this function.
84
84
def sendMsg(request, pagename, msg, msgtype):
 
85
    """
 
86
    @param msg: Message to show. Should be escaped.
 
87
    """
85
88
    from MoinMoin import Page
86
89
    request.theme.add_msg(msg, msgtype)
87
90
    return Page.Page(request, pagename).send_page()
107
110
        sendBackupForm(request, pagename)
108
111
    else:
109
112
        return sendMsg(request, pagename,
110
 
                       msg=_('Unknown backup subaction: %s.') % dowhat, msgtype="error")
111
 
 
 
113
                       msg=_('Unknown backup subaction: %s.') % wikiutil.escape(dowhat), msgtype="error")