diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-23 00:30:11 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-23 00:30:32 +0200 |
| commit | 8a336d01d2c403f0a2fb818edb8db836ddc367ef (patch) | |
| tree | ca890be01836689aa7b04c20ee42e9f2153e06e0 /actionpack/lib/action_controller/new_base/helpers.rb | |
| parent | 72a574b5073b1debd58c954b34c54d3bdee7749f (diff) | |
| download | rails-8a336d01d2c403f0a2fb818edb8db836ddc367ef.tar.gz rails-8a336d01d2c403f0a2fb818edb8db836ddc367ef.tar.bz2 rails-8a336d01d2c403f0a2fb818edb8db836ddc367ef.zip | |
Use super wherever possible in ActionController::Helpers#helper
Diffstat (limited to 'actionpack/lib/action_controller/new_base/helpers.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/helpers.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/new_base/helpers.rb b/actionpack/lib/action_controller/new_base/helpers.rb index 401741c249..e00c3c338b 100644 --- a/actionpack/lib/action_controller/new_base/helpers.rb +++ b/actionpack/lib/action_controller/new_base/helpers.rb @@ -16,8 +16,6 @@ module ActionController 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 @@ module ActionController 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 |