config should always be an AS::InheritableOptions object. Closes #1992

2 files changed, 5 insertions, 1 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index fd2970b8e2..36a0a20066 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -194,7 +194,7 @@ module ActionView #:nodoc:
     end
 
     def initialize(context = nil, assigns = {}, controller = nil, formats = nil) #:nodoc:
-      @_config = {}
+      @_config = ActiveSupport::InheritableOptions.new
 
       # Handle all these for backwards compatibility.
       # TODO Provide a new API for AV::Base and deprecate this one.
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index f463675a2e..a75f1bc981 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -45,6 +45,10 @@ module ActionView
       assert_same _view, view
     end
 
+    test "retrieve non existing config values" do
+      assert_equal nil, ActionView::Base.new.config.something_odd
+    end
+
     test "works without testing a helper module" do
       assert_equal 'Eloy', render('developers/developer', :developer => stub(:name => 'Eloy'))
     end