From 8d2355bb381540740e81804ed56cce92ca4d0a69 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 3 Aug 2011 09:36:16 -0400
Subject: fixed the unicode issue in template filter collapse and a misuse of a
 function in user_stats.html

---
 askbot/skins/default/templates/user_profile/user_stats.html | 2 +-
 askbot/templatetags/extra_filters_jinja.py                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/askbot/skins/default/templates/user_profile/user_stats.html b/askbot/skins/default/templates/user_profile/user_stats.html
index 8cae46c2..3fc8019b 100644
--- a/askbot/skins/default/templates/user_profile/user_stats.html
+++ b/askbot/skins/default/templates/user_profile/user_stats.html
@@ -117,7 +117,7 @@
                                     {% if award.content_type in (question_type, answer_type) %}
                                     <li>
                                         <a 
-                                            title="{{ award.content_object.get_snippet|collapse }}"
+                                            title="{{ award.content_object.get_snippet()|collapse }}"
                                             href="{{ award.content_object.get_absolute_url() }}"
                                         >{% if award.content_type == answer_type %}{% trans %}Answer to:{% endtrans %}{% endif %} {{ award.content_object.get_origin_post().title }}</a>
                                     </li>
diff --git a/askbot/templatetags/extra_filters_jinja.py b/askbot/templatetags/extra_filters_jinja.py
index 94bd304c..b74502df 100644
--- a/askbot/templatetags/extra_filters_jinja.py
+++ b/askbot/templatetags/extra_filters_jinja.py
@@ -41,7 +41,7 @@ def country_flag_url(country_code):
 
 @register.filter
 def collapse(input):
-    input = str(input)
+    input = unicode(input)
     return ' '.join(input.split())
 
 @register.filter
-- 
cgit v1.2.3-1-g7c22