Merge cacheimp -> master

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

diff --git a/forum/utils/html.py b/forum/utils/html.py
index 6afaf62ac3978f62ad6933b2a29ceb3679ef50c9..28a6a4b9647fe990dca340d502102c44a542e7ff 100644 (file)
--- a/forum/utils/html.py
+++ b/forum/utils/html.py
@@ -3,7 +3,7 @@
 from html5lib import sanitizer, serializer, tokenizer, treebuilders, treewalkers, HTMLParser
 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):
@@ -68,7 +68,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 hyperlink(settings.APP_URL + obj.get_absolute_url(), unicode(obj), **attrs)
+    return hyperlink(settings.APP_BASE_URL + obj.get_absolute_url(), unicode(obj), **attrs)