From 391c25fa4039361a29e7f8670618b8d2b1b8d4af Mon Sep 17 00:00:00 2001
From: xiez <xiez1989@gmail.com>
Date: Tue, 31 Jul 2012 10:51:50 +0800
Subject: [PATCH] Fix new line bug in leaving message and escape message
 replies to show `<br />`

---
 group/templates/group/group_info.html | 4 ++--
 group/views.py                        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html
index 25685ff936..9803b68813 100644
--- a/group/templates/group/group_info.html
+++ b/group/templates/group/group_info.html
@@ -80,7 +80,7 @@
 {% endif %}
 
 <div id="group-reply">
-    <h3>留言板</h3>
+    <h3>信息栏</h3>
     <form action="" method="post">
         <textarea name="message" id="message">{{ form.data.message }}</textarea><br />
         {% for error in form.message.errors %}
@@ -102,7 +102,7 @@
                 <a href="{{ SITE_ROOT }}profile/{{ msg.from_email }}/">{{ msg.from_email|email2nickname }}</a>
             </div>
             <div class="msg-bd">
-                <p>{{ msg.message|urlize|url_target_blank|find_at }}</p>
+                <p>{{ msg.message|linebreaksbr|urlize|url_target_blank|find_at }}</p>
                 {% if msg.reply_cnt == 0 %}
                 <a class="reply op" href="#" data="{{ msg.id }}">回复</a>
                 {% else %}
diff --git a/group/views.py b/group/views.py
index d82c7179f2..75b18c80f9 100644
--- a/group/views.py
+++ b/group/views.py
@@ -241,7 +241,8 @@ def msg_reply(request, msg_id):
             d = {}
             d['from_email'] = e.from_email
             d['nickname'] = e.nickname
-            d['message'] = e.message
+            from django.utils.html import escape
+            d['message'] = escape(e.message)
             l.append(d)
                 
         return HttpResponse(json.dumps(l), content_type=content_type)