Merge remote-tracking branch 'schmidt/b/266-fix-monkey-patching-of-rubytree'

85e1333e · Holger Just · c8e584e8 · 61e20cb2 · 85e1333e
Commit 85e1333e authored Mar 07, 2011 by Holger Just
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

menu_manager.rb lib/redmine/menu_manager.rb +8 -5

No files found.
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -23,12 +23,13 @@ module TreeNodePatch
    base.class_eval do
      attr_reader :last_items_count
      
-      alias :old_initilize :initialize
-      def initialize(name, content = nil)
-        old_initilize(name, content)
+      def initialize_with_redmine(name, content = nil)
+        extend InstanceMethods
        @last_items_count = 0
-        extend(InstanceMethods)
+
+        initialize_without_redmine(name, content)
      end
+      alias_method_chain :initialize, :redmine
    end
  end
  
@@ -99,7 +100,9 @@ module TreeNodePatch
    end
  end
 end
-Tree::TreeNode.send(:include, TreeNodePatch)
+unless Tree::TreeNode.included_modules.include?(TreeNodePatch)
+  Tree::TreeNode.send(:include, TreeNodePatch)
+end

 module Redmine
  module MenuManager