diff options
| author | Nick Sutterer <apotonick@gmail.com> | 2011-09-23 00:03:48 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-09-23 00:36:17 +0200 |
| commit | 552df29cc849500b6e2cbc4186e23c330909ae8e (patch) | |
| tree | 75bf1902734df376cb5502bc978378aff2724764 | |
| parent | 2e3eb2560b7686a633d6de35c4cd9131504aee38 (diff) | |
| download | rails-552df29cc849500b6e2cbc4186e23c330909ae8e.tar.gz rails-552df29cc849500b6e2cbc4186e23c330909ae8e.tar.bz2 rails-552df29cc849500b6e2cbc4186e23c330909ae8e.zip | |
Using #extract_details in PartialRenderer, too!
| -rw-r--r-- | actionpack/lib/action_view/renderer/abstract_renderer.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/renderer/partial_renderer.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb index 03feeff16c..c0936441ac 100644 --- a/actionpack/lib/action_view/renderer/abstract_renderer.rb +++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb @@ -22,8 +22,6 @@ module ActionView details end - - def extract_format(value, details) if value.is_a?(String) && value.sub!(formats_regexp, "") ActiveSupport::Deprecation.warn "Passing the format in the template name is deprecated. " \ diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb index fc39ee8498..e808fa3415 100644 --- a/actionpack/lib/action_view/renderer/partial_renderer.rb +++ b/actionpack/lib/action_view/renderer/partial_renderer.rb @@ -268,7 +268,7 @@ module ActionView @options = options @locals = options[:locals] || {} @block = block - @details = options.slice(:formats, :locale, :handlers) + @details = extract_details(options) if String === partial @object = options[:object] |