From e2024716e951c056db100d18374df860376c602d Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 16 Sep 2015 15:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E5=B7=AE?=
 =?UTF-8?q?=E5=88=AB=E7=9A=84html=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/journals/diff.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/journals/diff.html.erb b/app/views/journals/diff.html.erb
index 9e40dba68..b842d87d0 100644
--- a/app/views/journals/diff.html.erb
+++ b/app/views/journals/diff.html.erb
@@ -2,7 +2,7 @@
 <p>由<%= @journal.user %> 更新于 <%= format_time @journal.created_on %></p>
 
 <div class="text-diff" style="word-break:break-all; word-wrap:break-word;">
-  <%= simple_format_without_paragraph @diff.to_html%>
+  <%= @diff.to_html.gsub("&lt;","<").gsub("&gt;",">").gsub("&quot;","\"").gsub("&amp;gt;", ">").gsub("&amp;lt;", "<").gsub("&amp;quot;", "\"").html_safe %>
 </div>
 
 <p><%= link_to l(:button_back), issue_path(@issue), :onclick => 'history.back(); return false;' %></p>