Merged r11126 from trunk (#12744).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11145 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-01-09 13:31:05 +00:00
parent 2d6adbd7ff
commit 5c62c1cf95
2 changed files with 8 additions and 2 deletions
+2 -2
View File
@@ -147,10 +147,10 @@ module Redmine
unless block_given?
raise "Can not create a macro without a block!"
end
name = name.to_sym if name.is_a?(String)
name = name.to_s.downcase.to_sym
available_macros[name] = {:desc => @@desc || ''}.merge(options)
@@desc = nil
Definitions.send :define_method, "macro_#{name}".downcase, &block
Definitions.send :define_method, "macro_#{name}", &block
end
# Sets description for the next macro to be defined