Adds an option to macro definition to disable arguments parsing (#11578).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10174 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-08-08 16:28:33 +00:00
parent 405bcc10c0
commit e2d6f0af4e
3 changed files with 49 additions and 12 deletions

View File

@@ -860,8 +860,7 @@ module ApplicationHelper
# Macros substitution
def parse_macros(text, project, obj, attr, only_path, options)
text.gsub!(MACROS_RE) do
esc, all, macro = $1, $2, $3.downcase
args = ($5 || '').split(',').each(&:strip)
esc, all, macro, args = $1, $2, $3.downcase, $5.to_s
if esc.nil?
begin
exec_macro(macro, obj, args)