diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-02 09:09:02 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-02 15:16:58 -0200 |
| commit | eaa0d0b7744327151d44d0a147fbb70c72678d35 (patch) | |
| tree | e4a693e2f9f0c8199c82b8359578a29be9177fe7 /actionpack/lib | |
| parent | a50ab21cd164cd42eadd877d739d3eec5a24f410 (diff) | |
| download | rails-eaa0d0b7744327151d44d0a147fbb70c72678d35.tar.gz rails-eaa0d0b7744327151d44d0a147fbb70c72678d35.tar.bz2 rails-eaa0d0b7744327151d44d0a147fbb70c72678d35.zip | |
Merge pull request #8402 from senny/8376_descriptive_error_message_for_partial_layout_true
More descriptive error when rendering a partial with `:layout => true`
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_view/renderer/partial_renderer.rb
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/renderer/partial_renderer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb index 3093aca91e..71fa05ab3e 100644 --- a/actionpack/lib/action_view/renderer/partial_renderer.rb +++ b/actionpack/lib/action_view/renderer/partial_renderer.rb @@ -256,7 +256,7 @@ module ActionView object, as = @object, @variable if !block && (layout = @options[:layout]) - layout = find_template(layout) + layout = find_template(layout.to_s) end object ||= locals[as] |