Show line breaks in activity events summary.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2347 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3bdb6e2eb381a7b922784c5c4483199f944d0df3..27930ac948dca50ddc37548ed1701f9265ceb563 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -116,7 +116,7 @@ module ApplicationHelper
   end
   
   def format_activity_description(text)
-    h(truncate(text.to_s, 250).gsub(%r{<(pre|code)>.*$}m, '...'))
+    h(truncate(text.to_s, 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')).gsub(/[\r\n]+/, "<br />")
   end
 
   def distance_of_date_in_words(from_date, to_date = 0)