summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-03-20 12:54:23 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-03-20 12:54:23 +0000
commit533590c29cf3d22cd95975ad6d61c2c1bf70235d (patch)
tree7b521f2b8df1feb83fd126fa377426e13e220bf0 /lib
parent6e6e260ceae699d44be8bccc66ec0566695091a0 (diff)
downloadredmine-533590c29cf3d22cd95975ad6d61c2c1bf70235d.tar.gz
redmine-533590c29cf3d22cd95975ad6d61c2c1bf70235d.zip
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
Diffstat (limited to 'lib')
-rw-r--r--lib/redcloth3.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb
index fb9691631..045d44f5d 100644
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -381,9 +381,11 @@ class RedCloth3 < String
case rtype
when :limit
/(^|[>\s\(]) # sta
+ (?!\-\-)
(#{QTAGS_JOIN}|) # oqs
(#{rcq}) # qtag
(\w|[^\s].*?[^\s]) # content
+ (?!\-\-)
#{rcq}
(#{QTAGS_JOIN}|) # oqa
(?=[[:punct:]]|\s|\)|$)/x