kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: Double-dash results in strikethrough text (#5122). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3605 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-03-20 12:54:23 +00:00
parent 6e6e260cea
commit 533590c29c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redcloth3.rb
View File

@ -381,9 +381,11 @@ class RedCloth3 < String
case rtype case rtype
when :limit when :limit
/(^|[>\s\(]) # sta /(^|[>\s\(]) # sta
(?!\-\-)
(#{QTAGS_JOIN}|) # oqs (#{QTAGS_JOIN}|) # oqs
(#{rcq}) # qtag (#{rcq}) # qtag
(\w|[^\s].*?[^\s]) # content (\w|[^\s].*?[^\s]) # content
(?!\-\-)
#{rcq} #{rcq}
(#{QTAGS_JOIN}|) # oqa (#{QTAGS_JOIN}|) # oqa
(?=[[:punct:]]|\s|\)|$)/x (?=[[:punct:]]|\s|\)|$)/x

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

@ -71,6 +71,13 @@ class Redmine::WikiFormatting::TextileFormatterTest < HelperTestCase
) )
end end
def test_double_dashes_should_not_strikethrough
assert_html_output(
'double -- dashes -- test' => 'double -- dashes -- test',
'double -- *dashes* -- test' => 'double -- <strong>dashes</strong> -- test'
)
end
private private
def assert_html_output(to_test) def assert_html_output(to_test)