summaryrefslogtreecommitdiffstats
path: root/lib/redmine/wiki_formatting
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-12-10 13:55:47 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-12-10 13:55:47 +0000
commitb1bb26b1e0725411fe363c3e73d3bc9e6c5a9e9d (patch)
tree0b4e86b6399dcc43872ccb29fc949e7d87f74769 /lib/redmine/wiki_formatting
parent02893a17adfbab51630acf5b5305101f335fdef4 (diff)
downloadredmine-b1bb26b1e0725411fe363c3e73d3bc9e6c5a9e9d.tar.gz
redmine-b1bb26b1e0725411fe363c3e73d3bc9e6c5a9e9d.zip
ruby1.9: macro must accept 2 arguments.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8168 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/wiki_formatting')
-rw-r--r--lib/redmine/wiki_formatting/macros.rb2
1 files changed, 1 insertions, 1 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))