Merged r10885 from trunk (#12451).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@11007 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-15 07:54:21 +00:00
parent 0ebf95d819
commit 6062a0a89d
2 changed files with 20 additions and 1 deletions
@@ -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