From 94ed3501f8cc5d4f2d1d2085189c33e0ad16463c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 18 Jul 2015 10:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E4=B9=89=E5=A2=9E=E5=8A=A0&=E7=9A=84?=
 =?UTF-8?q?=E8=BD=AC=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 14a508d40..7b3d7bbe2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2345,6 +2345,6 @@ module ApplicationHelper
 
   #将文本内的/n转换为<br>
   def text_format text
-    text.gsub("<","&lt;").gsub(">","&gt;").gsub("\n","<br/>").html_safe
+    text.gsub("&","&amp;").gsub("<","&lt;").gsub(">","&gt;").gsub("\n","<br/>").html_safe
   end
 end