summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-08-08 18:54:01 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-08-08 18:54:01 +0000
commitb90739878805d587e00b0112a65e04f921883b75 (patch)
tree70ff525c45c2d55833e1e90eff7511b17aea843b /app
parent2e4f3d5a60c15887359d54a62449272731dc9137 (diff)
downloadredmine-b90739878805d587e00b0112a65e04f921883b75.tar.gz
redmine-b90739878805d587e00b0112a65e04f921883b75.zip
Slight change to the macro regexp.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10178 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2245944c8..983f3fd8b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -852,7 +852,7 @@ module ApplicationHelper
(
\{\{ # opening tag
([\w]+) # macro name
- (\(([^\}]*)\))? # optional arguments
+ (\((.*?)\))? # optional arguments
\}\} # closing tag
)
/x unless const_defined?(:MACROS_RE)