Commit b59c7a80 authored by maeda's avatar maeda

Fix: Textile phrase modifiers break wiki macros (#29247).

Patch by Stephan Wenzel.


git-svn-id: https://svn.redmine.org/redmine/trunk@17450 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 8f5ef54c
...@@ -343,7 +343,7 @@ class RedCloth3 < String ...@@ -343,7 +343,7 @@ class RedCloth3 < String
A_VLGN = /[\-^~]/ A_VLGN = /[\-^~]/
C_CLAS = '(?:\([^")]+\))' C_CLAS = '(?:\([^")]+\))'
C_LNGE = '(?:\[[a-z\-_]+\])' C_LNGE = '(?:\[[a-z\-_]+\])'
C_STYL = '(?:\{[^"}]+\})' C_STYL = '(?:\{[^{][^"}]+\})'
S_CSPN = '(?:\\\\\d+)' S_CSPN = '(?:\\\\\d+)'
S_RSPN = '(?:/\d+)' S_RSPN = '(?:/\d+)'
A = "(?:#{A_HLGN}?#{A_VLGN}?|#{A_VLGN}?#{A_HLGN}?)" A = "(?:#{A_HLGN}?#{A_VLGN}?|#{A_VLGN}?#{A_HLGN}?)"
......
...@@ -401,4 +401,9 @@ EXPECTED ...@@ -401,4 +401,9 @@ EXPECTED
assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(text).gsub(%r{[\r\n\t]}, '') assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(text).gsub(%r{[\r\n\t]}, '')
end end
def test_macro_should_support_phrase_modifiers
text = "*{{hello_world}}*"
assert_match %r|\A<p><strong>Hello world!.*</strong></p>\z|, textilizable(text)
end
end end
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