Merge commit 'rails/master'

1 files changed, 7 insertions, 13 deletions

diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb
index 38e3ce8127..968d3080c1 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/action_controller/abstract/helpers.rb
@@ -9,13 +9,6 @@ module AbstractController
       self.master_helper_module = Module.new
     end
 
-    # def self.included(klass)
-    #   klass.class_eval do
-    #     extlib_inheritable_accessor :master_helper_module
-    #     self.master_helper_module = Module.new
-    #   end
-    # end
-
     def _action_view
       @_action_view ||= begin
         av = super
@@ -23,19 +16,19 @@ module AbstractController
         av
       end
     end
-
+    
     module ClassMethods
       def inherited(klass)
         klass.master_helper_module = Module.new
         klass.master_helper_module.__send__ :include, master_helper_module
-
+        
         super
       end
-
+      
       def add_template_helper(mod)
         master_helper_module.module_eval { include mod }
       end
-
+      
       def helper_method(*meths)
         meths.flatten.each do |meth|
           master_helper_module.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
@@ -45,7 +38,7 @@ module AbstractController
           ruby_eval
         end
       end
-
+      
       def helper(*args, &blk)
         args.flatten.each do |arg|
           case arg
@@ -56,5 +49,6 @@ module AbstractController
         master_helper_module.module_eval(&blk) if block_given?
       end
     end
+    
   end
-end
+end
\ No newline at end of file