diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-12-03 06:15:55 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-12-03 06:15:55 +0000 |
| commit | 8066aa5eb1662f7045c29ddefeb1c8e5f86d00ba (patch) | |
| tree | b07187c2060735f41a7a40f8a819535d8120326f | |
| parent | 10ae93826e146fd631e314bcc4bd6a61108ddf74 (diff) | |
| download | redmine-8066aa5eb1662f7045c29ddefeb1c8e5f86d00ba.tar.gz redmine-8066aa5eb1662f7045c29ddefeb1c8e5f86d00ba.zip | |
Rails3: helper: html_safe for "format_activity_description" method
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8035 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/application_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5ad9b448c..42862175c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -176,7 +176,8 @@ module ApplicationHelper end def format_activity_description(text) - h(truncate(text.to_s, :length => 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')).gsub(/[\r\n]+/, "<br />") + h(truncate(text.to_s, :length => 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...') + ).gsub(/[\r\n]+/, "<br />").html_safe end def format_version_name(version) |