# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1368563556 -7200
# Node ID 544309e8c2c0f0e9699eeaf25f93bc33219f6104
# Parent  a8167055cd5dd03812787ef1fa604492cae71108
Fixed parser invocation for non-Moin-syntax parsers when formatting text.
Added the HTML parser as an available default parser in the enhanced parser
framework.

diff -r a8167055cd5d -r 544309e8c2c0 MoinSupport.py
--- a/MoinSupport.py	Tue May 07 23:48:11 2013 +0200
+++ b/MoinSupport.py	Tue May 14 22:32:36 2013 +0200
@@ -13,6 +13,7 @@
 
 from DateSupport import *
 from ItemSupport import ItemDirectoryStore
+from MoinMoin.parser import text_moin_wiki
 from MoinMoin.Page import Page
 from MoinMoin.util import lock
 from MoinMoin import config, search, wikiutil
@@ -768,7 +769,10 @@
     old_fmt = request.formatter
     request.formatter = fmt
     try:
-        return redirectedOutput(request, parser, fmt, inhibit_p=inhibit_p)
+        if isinstance(fmt, text_moin_wiki.Parser):
+            return redirectedOutput(request, parser, fmt, inhibit_p=inhibit_p)
+        else:
+            return redirectedOutput(request, parser, fmt)
     finally:
         request.formatter = old_fmt
 
@@ -825,6 +829,8 @@
             elif name == "text_moin_wiki":
                 available["text/moin-wiki"] = [parser_cls]
                 available["text/moin"] = [parser_cls]
+            elif name == "text_html":
+                available["text/html"] = [parser_cls]
 
         cfg.cache.MIMETYPE_TO_PARSER = available