diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-07-02 12:43:09 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-07-02 12:43:09 -0400 |
| commit | 3ed4d6c37552cc97464444a65074f3b8ddf7d9f5 (patch) | |
| tree | 5d8be200da5fcd3bc1d77f81f17e3b527622e960 /askbot/utils/html.py | |
| parent | 17ee9fe0f5de3489d35577a783748eb84602fa86 (diff) | |
| parent | 33fb5deb70373f251788b257e9fa0cbe16849b95 (diff) | |
| download | askbot-3ed4d6c37552cc97464444a65074f3b8ddf7d9f5.tar.gz askbot-3ed4d6c37552cc97464444a65074f3b8ddf7d9f5.tar.bz2 askbot-3ed4d6c37552cc97464444a65074f3b8ddf7d9f5.zip | |
merged with the master and tag-editor branches
Diffstat (limited to 'askbot/utils/html.py')
| -rw-r--r-- | askbot/utils/html.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/askbot/utils/html.py b/askbot/utils/html.py index 2e3c1913..44e3f1df 100644 --- a/askbot/utils/html.py +++ b/askbot/utils/html.py @@ -55,6 +55,11 @@ def sanitize_html(html): output_generator = s.serialize(stream) return u''.join(output_generator) +def site_url(url): + from askbot.conf import settings + base_url = urlparse(settings.APP_URL) + return base_url.scheme + '://' + base_url.netloc + url + def site_link(url_name, title): """returns html for the link to the given url todo: may be improved to process url parameters, keyword @@ -62,8 +67,8 @@ def site_link(url_name, title): """ from askbot.conf import settings base_url = urlparse(settings.APP_URL) - url = base_url.scheme + '://' + base_url.netloc + reverse(url_name) - return '<a href="%s">%s</a>' % (url, escape(title)) + url = site_url(reverse(url_name)) + return '<a href="%s">%s</a>' % (url, title) def unescape(text): """source: http://effbot.org/zone/re-sub.htm#unescape-html |