diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-08 20:57:33 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-08 20:57:33 +0100 |
| commit | 36eb1a686c831d5a14998bb9ac7cc60efa363373 (patch) | |
| tree | cdaa517ecfa17da37f9d5502a30ff9e73169ca47 /actionpack/lib/action_view/render | |
| parent | bdf5096816d03f2bdaefd20a07a0fa562543549c (diff) | |
| download | rails-36eb1a686c831d5a14998bb9ac7cc60efa363373.tar.gz rails-36eb1a686c831d5a14998bb9ac7cc60efa363373.tar.bz2 rails-36eb1a686c831d5a14998bb9ac7cc60efa363373.zip | |
Bring AM up to date with new rendering stack.
Diffstat (limited to 'actionpack/lib/action_view/render')
| -rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index d11f1fa2a7..0322d4b641 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -64,6 +64,8 @@ module ActionView Template::Text.new(options[:text], self.formats.try(:first)) elsif options.key?(:file) with_fallbacks { find_template(options[:file], options[:_prefix]) } + elsif options.key?(:_template) + options[:_template] elsif options.key?(:template) find_template(options[:template], options[:_prefix]) end |