diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-11-27 19:59:33 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-11-27 19:59:33 +0000 |
| commit | 14e56006a1f83ceb70291234d7b609150446aefb (patch) | |
| tree | a33f78387899ec3b5c43e0cf8f7637b1d8ad189a /lib/redmine | |
| parent | bf5b6014f7e985a87a1d0b6c0567939dbfe118a9 (diff) | |
| download | redmine-14e56006a1f83ceb70291234d7b609150446aefb.tar.gz redmine-14e56006a1f83ceb70291234d7b609150446aefb.zip | |
Fixed that #extract_macro_options should not be greedy (#12451).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10885 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine')
| -rw-r--r-- | lib/redmine/wiki_formatting/macros.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb index a50f2d289..64b7814b9 100644 --- a/lib/redmine/wiki_formatting/macros.rb +++ b/lib/redmine/wiki_formatting/macros.rb @@ -48,7 +48,7 @@ module Redmine def extract_macro_options(args, *keys) options = {} - while args.last.to_s.strip =~ %r{^(.+)\=(.+)$} && keys.include?($1.downcase.to_sym) + while args.last.to_s.strip =~ %r{^(.+?)\=(.+)$} && keys.include?($1.downcase.to_sym) options[$1.downcase.to_sym] = $2 args.pop end |