fail for marshaling on wiki.wikiToHtml()

[Shun-ichi Goto]

The method wiki.wikiToHtml() cause error:

cannot marshal <class 'trac.util.html.Markup'> objects

Here is a patch to fix.

wiki.py

@@ -167 +167 @@
 
     def wikiToHtml(self, req, text):
         """ Render arbitrary Wiki text as HTML. """
-        return wiki_to_html(text, self.env, req, absurls=1)
+        return unicode(wiki_to_html(text, self.env, req, absurls=1))

[David Van Maren]

Thanks for this patch -- my installation now works!

[Alec Thomas]

(In [1735]) Applied patches from gotoh and stp, thanks. Closes #434 and #845.