Commit 7c530f4d authored by jplang's avatar jplang

Fixed that formatting of commit message is never applied (#26445).

git-svn-id: https://svn.redmine.org/redmine/trunk@16823 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent e708ff61
...@@ -651,7 +651,7 @@ module ApplicationHelper ...@@ -651,7 +651,7 @@ module ApplicationHelper
if options[:formatting] == false if options[:formatting] == false
text = h(text) text = h(text)
else else
formatting = options[:formatting] || Setting.text_formatting formatting = Setting.text_formatting
text = Redmine::WikiFormatting.to_html(formatting, text, :object => obj, :attribute => attr) text = Redmine::WikiFormatting.to_html(formatting, text, :object => obj, :attribute => attr)
end end
......
...@@ -1297,6 +1297,14 @@ RAW ...@@ -1297,6 +1297,14 @@ RAW
end end
end end
def test_textilizable_with_formatting_set_to_false_should_not_format_text
assert_equal '*text*', textilizable("*text*", :formatting => false)
end
def test_textilizable_with_formatting_set_to_true_should_format_text
assert_equal '<p><strong>text</strong></p>', textilizable("*text*", :formatting => true)
end
def test_parse_redmine_links_should_handle_a_tag_without_attributes def test_parse_redmine_links_should_handle_a_tag_without_attributes
text = '<a>http://example.com</a>' text = '<a>http://example.com</a>'
expected = text.dup expected = text.dup
......
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