diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-01 11:41:16 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-01 11:41:16 +0100 |
| commit | 66615f25cf30835968f5c4798c5befea0d357e89 (patch) | |
| tree | e364f1340b605b861c688384914518e4964f8d17 /actionpack/lib/action_controller/metal/renderers.rb | |
| parent | 0dece7929cf5b04f008640936fb3ece24ce80daa (diff) | |
| parent | e5ab4b0d07ade8d89d633ca744c0eafbc53ee921 (diff) | |
| download | rails-66615f25cf30835968f5c4798c5befea0d357e89.tar.gz rails-66615f25cf30835968f5c4798c5befea0d357e89.tar.bz2 rails-66615f25cf30835968f5c4798c5befea0d357e89.zip | |
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/metal/renderers.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/renderers.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb index c1ba47927a..639b508746 100644 --- a/actionpack/lib/action_controller/metal/renderers.rb +++ b/actionpack/lib/action_controller/metal/renderers.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/class/attribute' + module ActionController def self.add_renderer(key, &block) Renderers.add(key, &block) @@ -7,8 +9,8 @@ module ActionController extend ActiveSupport::Concern included do - extlib_inheritable_accessor :_renderers - self._renderers = {} + class_attribute :_renderers + self._renderers = {}.freeze end module ClassMethods @@ -30,9 +32,11 @@ module ActionController end def use_renderers(*args) + new = _renderers.dup args.each do |key| - _renderers[key] = RENDERERS[key] + new[key] = RENDERERS[key] end + self._renderers = new.freeze _write_render_options end alias use_renderer use_renderers |