resolves an issue with tags used count that can get out of control if called from...

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

diff --git a/forum/utils/html.py b/forum/utils/html.py
index bf84e2f641c49c519fe6163f615468f42231c778..256a2d8ce2b2e67857523cd94c93d66c059d92a9 100644 (file)
--- a/forum/utils/html.py
+++ b/forum/utils/html.py
@@ -1,9 +1,10 @@
 """Utilities for working with HTML."""
 #import html5lib
 from html5lib import sanitizer, serializer, tokenizer, treebuilders, treewalkers, HTMLParser
 """Utilities for working with HTML."""
 #import html5lib
 from html5lib import sanitizer, serializer, tokenizer, treebuilders, treewalkers, HTMLParser

+from urllib import quote_plus

 from django.utils.html import strip_tags
 from forum.utils.html2text import HTML2Text
 from django.utils.html import strip_tags
 from forum.utils.html2text import HTML2Text

-from django.template import mark_safe
+from django.utils.safestring import mark_safe

 from forum import settings
 
 class HTMLSanitizerMixin(sanitizer.HTMLSanitizerMixin):
 from forum import settings
 
 class HTMLSanitizerMixin(sanitizer.HTMLSanitizerMixin):


@@ -50,7 +51,7 @@ def sanitize_html(html):
     return u''.join(output_generator)
 
 def cleanup_urls(url):
     return u''.join(output_generator)
 
 def cleanup_urls(url):

-    return strip_tags(url)
+    return quote_plus(strip_tags(url))

 
 
 def html2text(s, ignore_tags=(), indent_width=4, page_width=80):
 
 
 def html2text(s, ignore_tags=(), indent_width=4, page_width=80):


@@ -68,7 +69,7 @@ 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))
 
 def objlink(obj, **attrs):
     return mark_safe('<a href="%s" %s>%s</a>' % (url, " ".join('%s="%s"' % i for i in attrs.items()), title))
 
 def objlink(obj, **attrs):

-    return hyperlink(settings.APP_BASE_URL + obj.get_absolute_url(), unicode(obj), **attrs)
+    return hyperlink(settings.APP_URL + obj.get_absolute_url(), unicode(obj), **attrs)