meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 11:43:08 +00:00
Code Issues Releases Wiki Activity

Merged r17603 from trunk to 3.4-stable (#29756).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17604 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2018-10-28 11:04:15 +00:00
parent 98fc7c8d39
commit 042dd66527
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/wiki_formatting/textile/redcloth3.rb
View File

@ -1034,7 +1034,7 @@ class RedCloth3 < String
def flush_left( text )
indt = 0
if text =~ /^ /
while text !~ /^ {#{indt}}\S/
while text !~ /^ {#{indt}}[^ ]/
indt += 1
end unless text.empty?
if indt.nonzero?

6
test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
View File

@ -580,6 +580,12 @@ STR
}, false)
end
# TODO: Remove this test after migrating to RedCloth 4
def test_should_not_crash_with_special_input
assert_nothing_raised { to_html(" \f") }
assert_nothing_raised { to_html(" \v") }
end
private
def assert_html_output(to_test, expect_paragraph = true)