From f340941e3ec952c8791f65880c69fb8be689780f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 28 Sep 2015 13:35:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E6=8F=8F=E8=BF=B0=EF=BC=88?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=EF=BC=89=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8html=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_forums.html.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index ec19b5b97..1d2151b75 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -154,10 +154,9 @@
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%=@forum.topic_count%></a></div>
             </div>
             <div class="cl"></div>
-            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description%></span>
+            <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description.html_safe%></span>
               <%if @forum.creator.id == User.current.id%>
                   <a href="javascript:void(0);" onclick="edit_desc();">
-                  <!--<img src="<%#= Rails.root%>/images/signature_edit.png" width="12" height="12" />-->
                   <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%>
                   </a>
                <%end%>