diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-03-03 21:29:26 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-03-03 21:29:26 -0800 |
| commit | 7dbf5c820b3454da8194e2c823cdfd3982657f03 (patch) | |
| tree | fc21d9b2a645b5fe8c0dc6a6c3b6ff9d292bace7 | |
| parent | 15b3b74624eb4c5ae383956950cab12ca9899131 (diff) | |
| download | rails-7dbf5c820b3454da8194e2c823cdfd3982657f03.tar.gz rails-7dbf5c820b3454da8194e2c823cdfd3982657f03.tar.bz2 rails-7dbf5c820b3454da8194e2c823cdfd3982657f03.zip | |
Tweak how ActionPack handles InheritableOptions
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index cbd021e246..8e24d55ad0 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -1,3 +1,5 @@ +require 'active_support/ordered_options' + module AbstractController class Error < StandardError; end class ActionNotFound < StandardError; end diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 4374ab0a6b..5e0ed201cb 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -1,5 +1,4 @@ require 'active_support/core_ext/class/attribute' -require 'active_support/ordered_options' module ActionController # ActionController::Metal provides a way to get a valid Rack application from a controller. diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 87a1972fb4..76f9eb2b0d 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -297,7 +297,7 @@ module ActionView #:nodoc: @helpers = self.class.helpers || Module.new @_controller = controller - @_config = controller.config if controller + @_config = ActiveSupport::InheritableOptions.new(controller.config) if controller @_content_for = Hash.new {|h,k| h[k] = ActiveSupport::SafeBuffer.new } @_virtual_path = nil self.view_paths = view_paths |