Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-07 05:45:49 +01:00
Code Issues Packages Projects Releases Activity

Textile: ignore invalid lang attribute values (#18501).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13677 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2014-11-30 14:55:03 +00:00
parent f04148695a
commit ef5ff1630a
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/redcloth3.rb
View File

@@ -341,7 +341,7 @@ class RedCloth3 < String
A_HLGN = /(?:(?:<>|<|>|\=|[()]+)+)/ A_HLGN = /(?:(?:<>|<|>|\=|[()]+)+)/
A_VLGN = /[\-^~]/ A_VLGN = /[\-^~]/
C_CLAS = '(?:\([^")]+\))' C_CLAS = '(?:\([^")]+\))'
C_LNGE = '(?:\[[^"\[\]]+\])' C_LNGE = '(?:\[[a-z\-_]+\])'
C_STYL = '(?:\{[^"}]+\})' C_STYL = '(?:\{[^"}]+\})'
S_CSPN = '(?:\\\\\d+)' S_CSPN = '(?:\\\\\d+)'
S_RSPN = '(?:/\d+)' S_RSPN = '(?:/\d+)'
@@ -480,7 +480,7 @@ class RedCloth3 < String
end end
lang = $1 if lang = $1 if
text.sub!( /\[([^)]+?)\]/, '' ) text.sub!( /\[([a-z\-_]+?)\]/, '' )
cls = $1 if cls = $1 if
text.sub!( /\(([^()]+?)\)/, '' ) text.sub!( /\(([^()]+?)\)/, '' )

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

@@ -110,6 +110,20 @@ class Redmine::WikiFormatting::TextileFormatterTest < ActionView::TestCase
) )
end end
def test_lang_attribute
assert_html_output(
'*[fr]French*' => '<strong lang="fr">French</strong>',
'*[fr-fr]French*' => '<strong lang="fr-fr">French</strong>',
'*[fr_fr]French*' => '<strong lang="fr_fr">French</strong>'
)
end
def test_lang_attribute_should_ignore_invalid_value
assert_html_output(
'*[fr3]French*' => '<strong>[fr3]French</strong>'
)
end
def test_nested_lists def test_nested_lists
raw = <<-RAW raw = <<-RAW
# Item 1 # Item 1