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"