Index: app/helpers/application_helper.rb
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/helpers/application_helper.rb	(revision )
+++ app/helpers/application_helper.rb	(date 1346149541000)
@@ -955,7 +955,7 @@
                 \{\{                        # 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)
@@ -964,7 +964,7 @@
                   \{\{
                   macro\((\d+)\)
                   \}\}
-                  )/x unless const_defined?(:MACROS_SUB_RE)
+                  )/x unless const_defined?(:MACRO_SUB_RE)
 
   # Extracts macros from text
   def catch_macros(text)