From b57fbd079fe01243a23821816b6bc43ee8fe1f1e Mon Sep 17 00:00:00 2001
From: louant <louant@163.com>
Date: Wed, 22 Jun 2016 11:01:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E2=80=9C=E2=80=98?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=AE=E5=88=AB=E2=80=99=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8CHTML=E6=A0=87=E7=AD=BE=E6=9C=AA=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E2=80=9D=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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