567
567
if savetext is None:
571
# did user hit cancel button?
572
cancelled = request.form.has_key('button_cancel')
571
574
# convert input from Graphical editor
572
if lasteditor == 'gui':
573
from MoinMoin.converter.text_html_text_x_moin import convert
574
savetext = convert(request, pagename, savetext) # XXX error handling
575
from MoinMoin.converter.text_html_text_x_moin import convert, ConvertError
577
if lasteditor == 'gui':
578
savetext = convert(request, pagename, savetext)
580
# IMPORTANT: normalize text from the form. This should be done in
581
# one place before we manipulate the text.
582
savetext = pg.normalizeText(savetext, stripspaces=rstrip)
584
# we don't want to throw an exception if user cancelled anyway
576
# IMPORTANT: normalize text from the form. This should be done in
577
# one place before we manipulate the text.
578
savetext = pg.normalizeText(savetext, stripspaces=rstrip)
589
pg.sendCancel(savetext or "", rev)
580
592
comment = wikiutil.clean_comment(comment)
583
if request.form.has_key('button_cancel'):
584
pg.sendCancel(savetext or "", rev)
589
596
# TODO: this code does not work with extended links, and is doing
775
782
Page(request, pagename).send_page(request)
778
request.http_headers(["Content-type: text/plain;charset=%s" % config.charset])
780
785
if request.form.has_key('rev'):
782
787
rev = request.form['rev'][0]
791
796
page = Page(request, pagename)
793
text = page.get_raw_body()
794
text = page.encodeTextMimeType(text)
796
raise MoinMoinNoFooter
799
801
def do_format(pagename, request):