aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/base.rb
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-10-15 14:41:59 -0700
committerYehuda Katz <wycats@gmail.com>2009-10-15 14:41:59 -0700
commite1490d4e4c60211173d51e7b21c16dbe4c2d942a (patch)
tree673813015c1328f600862d7de82f2a3f538980d4 /actionpack/lib/action_view/base.rb
parent02b76862e1ff8ceccb3cd48922ac178462e14892 (diff)
downloadrails-e1490d4e4c60211173d51e7b21c16dbe4c2d942a.tar.gz
rails-e1490d4e4c60211173d51e7b21c16dbe4c2d942a.tar.bz2
rails-e1490d4e4c60211173d51e7b21c16dbe4c2d942a.zip
Change config implementation in AV slightly
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
-rw-r--r--actionpack/lib/action_view/base.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 58dae0bb0f..84e4103280 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -167,7 +167,16 @@ module ActionView #:nodoc:
module Subclasses
end
- include Helpers, Rendering, Partials, ::ERB::Util, ActiveSupport::Configurable
+ include Helpers, Rendering, Partials, ::ERB::Util
+
+ def config
+ self.config = DEFAULT_CONFIG unless @config
+ @config
+ end
+
+ def config=(config)
+ @config = ActiveSupport::OrderedOptions.new.merge(config)
+ end
extend ActiveSupport::Memoizable