Project

General

Profile

Defect #11736 ยป Fixed_multi-line_macros.patch

Anton Argirov, 2012-08-30 06:07

View differences:

app/helpers/application_helper.rb (date 1346149541000)
955 955
                \{\{                        # opening tag
956 956
                ([\w]+)                     # macro name
957 957
                (\(([^\n\r]*?)\))?          # optional arguments
958
                ([\n\r].*[\n\r])?           # optional block of text
958
                ([\n\r].*?[\n\r])?          # optional block of text
959 959
                \}\}                        # closing tag
960 960
                )
961 961
               )/mx unless const_defined?(:MACROS_RE)
......
964 964
                  \{\{
965 965
                  macro\((\d+)\)
966 966
                  \}\}
967
                  )/x unless const_defined?(:MACROS_SUB_RE)
967
                  )/x unless const_defined?(:MACRO_SUB_RE)
968 968

  
969 969
  # Extracts macros from text
970 970
  def catch_macros(text)
    (1-1/1)