diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-18 12:08:50 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-18 12:08:50 -0700 |
| commit | 9f7eaea201b2f408d9effbf82f2731957e284adf (patch) | |
| tree | 57ae3b2d0cec49336065edbb7727fec4c6ccca87 /actionpack/lib/action_view/render | |
| parent | 497554fd10e8c7efc54a805661907bc39c8fe6e9 (diff) | |
| download | rails-9f7eaea201b2f408d9effbf82f2731957e284adf.tar.gz rails-9f7eaea201b2f408d9effbf82f2731957e284adf.tar.bz2 rails-9f7eaea201b2f408d9effbf82f2731957e284adf.zip | |
Minor ActionView cleanup
Diffstat (limited to 'actionpack/lib/action_view/render')
| -rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index a9a40c099c..162e38c484 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -99,14 +99,12 @@ module ActionView def _render_template(template, local_assigns = {}) with_template(template) do - _evaluate_assigns_and_ivars - template.render(self, local_assigns) do |*names| capture(*names, &layout_proc(names.first)) end end rescue Exception => e - if TemplateError === e + if e.is_a?(TemplateError) e.sub_template_of(template) raise e else |