diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-12-28 20:53:58 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-12-28 20:53:58 +0100 |
| commit | 0efec64520d5153e5a961f9a759883656b83bb53 (patch) | |
| tree | 31bc504daa1318cb73659e7df01c8ab885e3495f /actionpack/lib/action_controller/helpers.rb | |
| parent | 66ee5890c5f21995b7fe0c486547f1287afe2b55 (diff) | |
| parent | a2270ef2594b97891994848138614657363f2806 (diff) | |
| download | rails-0efec64520d5153e5a961f9a759883656b83bb53.tar.gz rails-0efec64520d5153e5a961f9a759883656b83bb53.tar.bz2 rails-0efec64520d5153e5a961f9a759883656b83bb53.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/helpers.rb')
| -rw-r--r-- | actionpack/lib/action_controller/helpers.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/helpers.rb b/actionpack/lib/action_controller/helpers.rb index 402750c57d..ba65032f6a 100644 --- a/actionpack/lib/action_controller/helpers.rb +++ b/actionpack/lib/action_controller/helpers.rb @@ -163,9 +163,9 @@ module ActionController #:nodoc: def helper_method(*methods) methods.flatten.each do |method| master_helper_module.module_eval <<-end_eval - def #{method}(*args, &block) - controller.send(%(#{method}), *args, &block) - end + def #{method}(*args, &block) # def current_user(*args, &block) + controller.send(%(#{method}), *args, &block) # controller.send(%(current_user), *args, &block) + end # end end_eval end end |