diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-15 16:47:15 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-15 16:47:15 +0200 |
| commit | 59653101b8cef7915cb1fb4ad4b84f49ae0881e5 (patch) | |
| tree | 9dacd7eaa05c7957b14389538a30d7ebf7f7e349 /actionpack/lib/action_controller/abstract/helpers.rb | |
| parent | 26ad104e72e2b758815a043341dd83a1b02e8c7f (diff) | |
| parent | eb021707f53be46140b55a48e5ef03ed0577a45c (diff) | |
| download | rails-59653101b8cef7915cb1fb4ad4b84f49ae0881e5.tar.gz rails-59653101b8cef7915cb1fb4ad4b84f49ae0881e5.tar.bz2 rails-59653101b8cef7915cb1fb4ad4b84f49ae0881e5.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_view/helpers/form_helper.rb
Diffstat (limited to 'actionpack/lib/action_controller/abstract/helpers.rb')
| -rw-r--r-- | actionpack/lib/action_controller/abstract/helpers.rb | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb index 1f0b38417b..968d3080c1 100644 --- a/actionpack/lib/action_controller/abstract/helpers.rb +++ b/actionpack/lib/action_controller/abstract/helpers.rb @@ -1,19 +1,14 @@ module AbstractController module Helpers + extend ActiveSupport::DependencyModule + depends_on Renderer - - setup do + + included do extlib_inheritable_accessor :master_helper_module 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 |