Tweak how ActionPack handles InheritableOptions

rails · Mar 4, 2010 · 7dbf5c8 · 7dbf5c8
1 parent 15b3b74
commit 7dbf5c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -297,7 +297,7 @@ def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil,
       @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