Added extra check to avoid empty tags been sent in notifications.

[osqa.git] / forum / skins / default / templates / notifications / newanswer.html

diff --git a/forum/skins/default/templates/notifications/newanswer.html b/forum/skins/default/templates/notifications/newanswer.html
index e9bbaaa1b8ca8bb61332a161ce08176a1405aaea..1f3140ce4851c26a525b60849e87b6d8dae33710 100644 (file)
--- a/forum/skins/default/templates/notifications/newanswer.html
+++ b/forum/skins/default/templates/notifications/newanswer.html
@@ -1,13 +1,13 @@
 {% load i18n extra_tags email_tags %}
 
 {% declare %}
 {% load i18n extra_tags email_tags %}
 
 {% declare %}

-    prefix = html.mark_safe(settings.EMAIL_SUBJECT_PREFIX)
-    app_name = settings.APP_SHORT_NAME
-    safe_app_name = html.mark_safe(settings.APP_SHORT_NAME)
-    answer_author = html.mark_safe(answer.author.username)
+    prefix = html.mark_safe(smart_str(settings.EMAIL_SUBJECT_PREFIX))
+    app_name = smart_str(settings.APP_SHORT_NAME)
+    safe_app_name = html.mark_safe(smart_str(settings.APP_SHORT_NAME))
+    answer_author = html.mark_safe(smart_str(answer.author.username))

     question = answer.question
     question = answer.question

-    question_title = html.mark_safe(question.title)
-    safe_body = html.html2text(answer.html)
+    question_title = html.mark_safe(smart_str(question.title))
+    safe_body = html.html2text(smart_str(answer.html))

     author_link = html.objlink(answer.author, style=settings.EMAIL_ANCHOR_STYLE)
     question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}
     author_link = html.objlink(answer.author, style=settings.EMAIL_ANCHOR_STYLE)
     question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
 {% enddeclare %}