aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/base.rb
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-03-03 21:29:26 -0800
committerCarl Lerche <carllerche@mac.com>2010-03-03 21:29:26 -0800
commit7dbf5c820b3454da8194e2c823cdfd3982657f03 (patch)
treefc21d9b2a645b5fe8c0dc6a6c3b6ff9d292bace7 /actionpack/lib/action_view/base.rb
parent15b3b74624eb4c5ae383956950cab12ca9899131 (diff)
downloadrails-7dbf5c820b3454da8194e2c823cdfd3982657f03.tar.gz
rails-7dbf5c820b3454da8194e2c823cdfd3982657f03.tar.bz2
rails-7dbf5c820b3454da8194e2c823cdfd3982657f03.zip
Tweak how ActionPack handles InheritableOptions
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
-rw-r--r--actionpack/lib/action_view/base.rb2
1 files changed, 1 insertions, 1 deletions
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