ruby1.9: macro must accept 2 arguments.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8168 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index 2f9dd99eb..de23eabb0 100644
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -77,7 +77,7 @@ module Redmine
       end
 
       desc "Displays a list of all available macros, including description if available."
-      macro :macro_list do
+      macro :macro_list do |obj, args|
         out = ''
         @@available_macros.keys.collect(&:to_s).sort.each do |macro|
           out << content_tag('dt', content_tag('code', macro))
diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
index bd271446c..3f4966bbf 100644
--- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
@@ -41,7 +41,7 @@ class Redmine::WikiFormatting::MacrosTest < ActionView::TestCase
 
   def test_macro_registration
     Redmine::WikiFormatting::Macros.register do
-      macro :foo do
+      macro :foo do |obj, args|
         "Foo macro output"
       end
     end