summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-11-11 16:23:11 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-11-11 16:23:11 +0000
commit1d8b4ee778575ba884a440eb7efbe0aaf206b2bb (patch)
treeb8bfe7862f2804a7b82c1616c7e83eb88bce487d /lib
parent22d12032e75d60bf6ce2668d98a8cff714ce2bc5 (diff)
downloadredmine-1d8b4ee778575ba884a440eb7efbe0aaf206b2bb.tar.gz
redmine-1d8b4ee778575ba884a440eb7efbe0aaf206b2bb.zip
Fixed pre tags containing "<pre*" (#4125).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3030 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redcloth3.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb
index 3f79ed99b..0adf2076e 100644
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -1016,7 +1016,7 @@ class RedCloth3 < String
end
OFFTAGS = /(code|pre|kbd|notextile)/
- OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }>)|(<#{ OFFTAGS }[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }|\Z)/mi
+ OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }>)|(<#{ OFFTAGS }[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }\W|\Z)/mi
OFFTAG_OPEN = /<#{ OFFTAGS }/
OFFTAG_CLOSE = /<\/?#{ OFFTAGS }/
HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m