diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-10-06 11:03:58 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-10-06 11:03:58 +0000 |
| commit | 55f10b90f4baf3a2c710c89f67e275424ddd5a72 (patch) | |
| tree | 8af8d288d109a02124c894f36b674049a4f50b0e /app/helpers | |
| parent | 942cd9bac2be0030ef0095adcce38beb9acfc368 (diff) | |
| download | redmine-55f10b90f4baf3a2c710c89f67e275424ddd5a72.tar.gz redmine-55f10b90f4baf3a2c710c89f67e275424ddd5a72.zip | |
Rails3: helper: use html_safe at simple_format_without_paragraph of ApplicationHelper
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7585 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
| -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 df35a379d..93ef7a6ad 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -774,7 +774,8 @@ module ApplicationHelper text.to_s. gsub(/\r\n?/, "\n"). # \r\n and \r -> \n gsub(/\n\n+/, "<br /><br />"). # 2+ newline -> 2 br - gsub(/([^\n]\n)(?=[^\n])/, '\1<br />') # 1 newline -> br + gsub(/([^\n]\n)(?=[^\n])/, '\1<br />'). # 1 newline -> br + html_safe end def lang_options_for_select(blank=true) |