Tweak how ActionPack handles InheritableOptions
This commit is contained in:
parent
15b3b74624
commit
7dbf5c820b
|
@ -1,3 +1,5 @@
|
|||
require 'active_support/ordered_options'
|
||||
|
||||
module AbstractController
|
||||
class Error < StandardError; end
|
||||
class ActionNotFound < StandardError; end
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue