summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-07-21 00:16:27 +0000
committerGo MAEDA <maeda@farend.jp>2018-07-21 00:16:27 +0000
commit26f4b5181f4d2b44ccaf74c6f29af225420e0d8a (patch)
tree77325a4f73ebc7101d81d28bd25f30caa5a9e766 /lib
parent8b0d9cce923ce459999632e79c9dec606863dd0d (diff)
downloadredmine-26f4b5181f4d2b44ccaf74c6f29af225420e0d8a.tar.gz
redmine-26f4b5181f4d2b44ccaf74c6f29af225420e0d8a.zip
Fix: Textile phrase modifiers break wiki macros (#29247).
Patch by Stephan Wenzel. git-svn-id: http://svn.redmine.org/redmine/trunk@17450 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/wiki_formatting/textile/redcloth3.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb
index 291a0e2d4..2349a0b84 100644
--- a/lib/redmine/wiki_formatting/textile/redcloth3.rb
+++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb
@@ -343,7 +343,7 @@ class RedCloth3 < String
A_VLGN = /[\-^~]/
C_CLAS = '(?:\([^")]+\))'
C_LNGE = '(?:\[[a-z\-_]+\])'
- C_STYL = '(?:\{[^"}]+\})'
+ C_STYL = '(?:\{[^{][^"}]+\})'
S_CSPN = '(?:\\\\\d+)'
S_RSPN = '(?:/\d+)'
A = "(?:#{A_HLGN}?#{A_VLGN}?|#{A_VLGN}?#{A_HLGN}?)"