diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-01 11:41:16 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-01 11:41:16 +0100 |
| commit | 66615f25cf30835968f5c4798c5befea0d357e89 (patch) | |
| tree | e364f1340b605b861c688384914518e4964f8d17 /actionpack/lib/abstract_controller/helpers.rb | |
| parent | 0dece7929cf5b04f008640936fb3ece24ce80daa (diff) | |
| parent | e5ab4b0d07ade8d89d633ca744c0eafbc53ee921 (diff) | |
| download | rails-66615f25cf30835968f5c4798c5befea0d357e89.tar.gz rails-66615f25cf30835968f5c4798c5befea0d357e89.tar.bz2 rails-66615f25cf30835968f5c4798c5befea0d357e89.zip | |
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'actionpack/lib/abstract_controller/helpers.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/helpers.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb index eb621c0865..578b884a4d 100644 --- a/actionpack/lib/abstract_controller/helpers.rb +++ b/actionpack/lib/abstract_controller/helpers.rb @@ -1,4 +1,6 @@ require 'active_support/dependencies' +require 'active_support/core_ext/class/attribute' +require 'active_support/core_ext/module/delegation' module AbstractController module Helpers @@ -12,10 +14,10 @@ module AbstractController end included do - extlib_inheritable_accessor(:_helpers) { Module.new } - extlib_inheritable_accessor(:_helper_serial) do - AbstractController::Helpers.next_serial - end + class_attribute :_helpers, :_helper_serial + delegate :_helpers, :to => :'self.class' + self._helpers = Module.new + self._helper_serial = ::AbstractController::Helpers.next_serial end module ClassMethods |