dolphin-emu/redmine
1
0
Fork 0
mirror of https://github.com/dolphin-emu/redmine.git synced 2024-11-23 09:29:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged r16823 (#26445).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16824 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-07-16 18:04:00 +00:00
parent f9ff1c1a15
commit bf149a63c0
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -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

8
test/unit/helpers/application_helper_test.rb
View File

@ -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