Several improvements in the node bulk management feature. Improved filters and added...

[osqa.git] / forum / utils / html.py

diff --git a/forum/utils/html.py b/forum/utils/html.py
index 16d5ac66bf7aa7a7ca12b86e055e87878ec85613..86a4ef9119cf417f876d1ceb25c7c04460640ba7 100644 (file)
--- a/forum/utils/html.py
+++ b/forum/utils/html.py
@@ -55,10 +55,10 @@ def html2text(s, ignore_tags=(), indent_width=4, page_width=80):
     parser.feed(s)
     parser.close()
     parser.generate()
-    return parser.result
+    return mark_safe(parser.result)
 
 def buildtag(name, content, **attrs):
-    return mark_safe('<%s %s>%s</a>' % (name, " ".join('%s="%s"' % i for i in attrs.items()), content))
+    return mark_safe('<%s %s>%s</%s>' % (name, " ".join('%s="%s"' % i for i in attrs.items()), unicode(content), name))
 
 def hyperlink(url, title, **attrs):
     return mark_safe('<a href="%s" %s>%s</a>' % (url, " ".join('%s="%s"' % i for i in attrs.items()), title))