Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use super wherever possible in ActionController::Helpers#helper

  • Loading branch information...
commit 8a336d01d2c403f0a2fb818edb8db836ddc367ef 1 parent 72a574b
@lifo lifo authored
Showing with 2 additions and 5 deletions.
  1. +2 −5 actionpack/lib/action_controller/new_base/helpers.rb
View
7 actionpack/lib/action_controller/new_base/helpers.rb
@@ -16,8 +16,6 @@ module Helpers
module ClassMethods
def inherited(klass)
- # klass.master_helper_module = Module.new
- # klass.master_helper_module.__send__ :include, master_helper_module
klass.__send__ :default_helper_module!
super
end
@@ -78,10 +76,9 @@ def helper(*args, &block)
end
end
- add_template_helper(class_name.constantize)
+ super class_name.constantize
else
- # Explcit 'return' here so that the supplied block ( if any ) doesn't get included twice
- return super
+ super args
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.