Fixed: New multi-line macros regexp is too eager (#11736).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10276 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 10:24:56 +00:00
parent 265baa1b2c
commit 8b72710d7e
2 changed files with 20 additions and 1 deletions
@@ -867,7 +867,7 @@ module ApplicationHelper
                \{\{                        # opening tag
                ([\w]+)                     # macro name
                (\(([^\n\r]*?)\))?          # optional arguments
-                ([\n\r].*[\n\r])?           # optional block of text
+                ([\n\r].*?[\n\r])?          # optional block of text
                \}\}                        # closing tag
                )
               )/mx unless const_defined?(:MACROS_RE)