From 55f57ef8b79a54211e90a5c9235796ccc2fcf177 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 18 Jul 2015 15:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/users_helper.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index db041c0ba..d4f9e4eb8 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -434,6 +434,8 @@ module UsersHelper
   def get_activity_act_showname_htmlclear(activity)
     str = get_activity_act_showname(activity)
     str = str.gsub(/<.*>/,'')
+    str = str.gsub(/\r/,'')
+    str = str.gsub(/\n/,'')
     str = str.lstrip.rstrip
     if str == ''
       str = 'RE:'
@@ -449,7 +451,9 @@ module UsersHelper
       when "Journal"
         arr = details_to_strings(activity.act.details,true)
         arr << activity.act.notes
-        return arr.to_s
+        str = ''
+        arr.each { |item| str = str+item }
+        return str
       when "JournalsForMessage"
         return activity.act.notes
       when "Message"