diff lib/redmine/wiki_formatting/macros.rb @ 1297:0a574315af3e redmine-2.2-integration

Merge from branch "redmine-2.2"

--- a/lib/redmine/wiki_formatting/macros.rb	Tue May 21 18:15:48 2013 +0100
+++ b/lib/redmine/wiki_formatting/macros.rb	Fri Jun 14 09:07:32 2013 +0100
@@ -147,10 +147,10 @@
           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