diff options
Diffstat (limited to 'actionview/lib/action_view/base.rb')
| -rw-r--r-- | actionview/lib/action_view/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb index 556a5ee502..22d1895560 100644 --- a/actionview/lib/action_view/base.rb +++ b/actionview/lib/action_view/base.rb @@ -213,6 +213,8 @@ module ActionView #:nodoc: context.lookup_context when Array ActionView::LookupContext.new(context) + when ActionView::PathSet + ActionView::LookupContext.new(context) when nil ActionView::LookupContext.new([]) else @@ -286,7 +288,7 @@ module ActionView #:nodoc: self.class end - def in_context(options, locals) + def in_rendering_context(options) old_view_renderer = @view_renderer old_lookup_context = @lookup_context |