Commit 623ccaa3 authored by tmaruyama's avatar tmaruyama

Rails3: helper: use html_safe at simple_format_without_paragraph of ApplicationHelper

git-svn-id: https://svn.redmine.org/redmine/trunk@7585 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent f323a1d7
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment