Skip to content
Browse files

Tweak how ActionPack handles InheritableOptions

  • Loading branch information...
1 parent 15b3b74 commit 7dbf5c820b3454da8194e2c823cdfd3982657f03 Carl Lerche committed
View
2 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
View
1 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.
View
2 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

0 comments on commit 7dbf5c8

Please sign in to comment.
Something went wrong with that request. Please try again.