diff options
| author | José Valim <jose.valim@gmail.com> | 2012-04-03 11:28:14 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-04-03 11:28:14 -0700 |
| commit | 3352e3b61035045bfed6f62b661cae4274127abc (patch) | |
| tree | 8e485804d6e7b3cbb9be0ce4ab0ebe6242ae4425 | |
| parent | 0cc6c5fec235cca6d7eb85d4f849536db8566e93 (diff) | |
| parent | f181d7e3ef7bd2e951b748dbbd607d05e36b6f85 (diff) | |
| download | rails-3352e3b61035045bfed6f62b661cae4274127abc.tar.gz rails-3352e3b61035045bfed6f62b661cae4274127abc.tar.bz2 rails-3352e3b61035045bfed6f62b661cae4274127abc.zip | |
Merge pull request #5723 from tiegz/minor_fixes
minor elsif/else typo fix
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 056dbc9529..f3315948b4 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -200,7 +200,7 @@ module ActionView #:nodoc: # TODO Provide a new API for AV::Base and deprecate this one. if context.is_a?(ActionView::Renderer) @view_renderer = context - elsif + else lookup_context = context.is_a?(ActionView::LookupContext) ? context : ActionView::LookupContext.new(context) lookup_context.formats = formats if formats |