diff options
| author | Michael S. Klishin <michael@novemberain.com> | 2008-12-28 23:47:29 +0300 |
|---|---|---|
| committer | Michael S. Klishin <michael@novemberain.com> | 2008-12-28 23:47:29 +0300 |
| commit | 2b8750eba439c4b829b2e8172a1edc0dfa9c532b (patch) | |
| tree | 1ea12e7fe5ad299119d801c7e7f527f6b7780bc3 /actionpack/lib/action_controller/helpers.rb | |
| parent | e523b43e202d343912f67b8c8737d9e2e956b31f (diff) | |
| parent | 0efec64520d5153e5a961f9a759883656b83bb53 (diff) | |
| download | rails-2b8750eba439c4b829b2e8172a1edc0dfa9c532b.tar.gz rails-2b8750eba439c4b829b2e8172a1edc0dfa9c532b.tar.bz2 rails-2b8750eba439c4b829b2e8172a1edc0dfa9c532b.zip | |
Sync with rails/rails/master, merge two metaprogramming annotation efforts
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 |