summaryrefslogtreecommitdiffstats
path: root/askbot/templatetags
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2011-12-10 16:17:34 -0300
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2011-12-10 16:17:34 -0300
commit6db4407af3ed35891afc0c548bdcd1d27bf460fd (patch)
tree628d7f9f23c468c54584dd092c2757e55fef6871 /askbot/templatetags
parent3d89144ab906b6f2c9ab609a4193a3be0c716512 (diff)
downloadaskbot-6db4407af3ed35891afc0c548bdcd1d27bf460fd.tar.gz
askbot-6db4407af3ed35891afc0c548bdcd1d27bf460fd.tar.bz2
askbot-6db4407af3ed35891afc0c548bdcd1d27bf460fd.zip
made askbot work with Django 1.2 again
Diffstat (limited to 'askbot/templatetags')
-rw-r--r--askbot/templatetags/extra_filters_jinja.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/askbot/templatetags/extra_filters_jinja.py b/askbot/templatetags/extra_filters_jinja.py
index 8486d934..f4e0a5ee 100644
--- a/askbot/templatetags/extra_filters_jinja.py
+++ b/askbot/templatetags/extra_filters_jinja.py
@@ -14,6 +14,7 @@ from askbot.conf import settings as askbot_settings
from askbot.skins import utils as skin_utils
from askbot.utils import functions
from askbot.utils.slug import slugify
+from askbot.shims.django_shims import ResolverMatch
from django_countries import countries
from django_countries import settings as countries_settings
@@ -36,8 +37,9 @@ absolutize_urls = register.filter(absolutize_urls_func)
def clean_login_url(url):
"""pass through, unless user was originally on the logout page"""
try:
- resolver_match = resolve(url)
- if resolver_match.url_name == 'question':
+ resolver_match = ResolverMatch(resolve(url))
+ from askbot.views.readers import question
+ if resolver_match.func == question:
return url
except Http404:
pass