← Back to branch summary

~ubuntu-branches/ubuntu/vivid/moin/vivid

« back to all changes in this revision

Viewing changes to MoinMoin/action/Despam.py

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-01-07 21:33:21 UTC
  • mfrom: (0.1.34 sid)
  • Revision ID: package-import@ubuntu.com-20140107213321-574mr13z2oebjgms
Tags: 1.9.7-1ubuntu1
* Merge with Debian; remaining changes:
* debian/control:
  - remove python-xml from Suggests field, the package isn't in
    sys.path any more.
  - 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/Despam.py
204
204
    if (request.method == 'POST' and ok and
205
205
        wikiutil.checkTicket(request, request.form.get('ticket', ''))):
206
206
        revert_pages(request, editor, timestamp)
 
207
        request.write(show_editors(request, pagename, timestamp))
207
208
    elif editor:
208
209
        show_pages(request, pagename, editor, timestamp)
209
210
    else: