Added:

* the 'include' macro to include a wiki page
* macro escaping support (with exclamation mark)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1153 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 14 insertions, 7 deletions

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index f7fa803a6..79da2a38a 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -93,21 +93,28 @@ module Redmine
       end
       
       MACROS_RE = /
+                    (!)?                        # escaping
+                    (
                     \{\{                        # opening tag
                     ([\w]+)                     # macro name
                     (\(([^\}]*)\))?             # optional arguments
                     \}\}                        # closing tag
+                    )
                   /x unless const_defined?(:MACROS_RE)
       
       def inline_macros(text)
         text.gsub!(MACROS_RE) do
-          all, macro = $&, $1.downcase
-          args = ($3 || '').split(',').each(&:strip)
-          begin
-            @macros_runner.call(macro, args)
-          rescue => e
-            "<div class=\"flash error\">Error executing the <strong>#{macro}</strong> macro (#{e})</div>"
-          end || all
+          esc, all, macro = $1, $2, $3.downcase
+          args = ($5 || '').split(',').each(&:strip)
+          if esc.nil?
+            begin
+              @macros_runner.call(macro, args)
+            rescue => e
+              "<div class=\"flash error\">Error executing the <strong>#{macro}</strong> macro (#{e})</div>"
+            end || all
+          else
+            all
+          end
         end
       end