diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-07-01 12:55:19 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-07-01 12:55:19 -0700 |
| commit | e7312105c73c20b286ebf17b16808001803e2c61 (patch) | |
| tree | 3e23282353ffa6e6fc1ca53afc2e0b35f51a6274 /actionpack/lib/action_view/render/rendering.rb | |
| parent | 54f48517708d16e92bfc6bab6255f6299ca80af0 (diff) | |
| parent | 1026d7706ffb467eac3cee8142d964bc2d30baa8 (diff) | |
| download | rails-e7312105c73c20b286ebf17b16808001803e2c61.tar.gz rails-e7312105c73c20b286ebf17b16808001803e2c61.tar.bz2 rails-e7312105c73c20b286ebf17b16808001803e2c61.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_view/render/rendering.rb')
| -rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index 588a64a652..162e38c484 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -84,7 +84,7 @@ module ActionView # ==== Example # # # The template - # <% render :layout => "my_layout" do |name| %>Hello <%= customer.name %><% end %> + # <% render :layout => "my_layout" do |customer| %>Hello <%= customer.name %><% end %> # # # The layout # <html><% yield Struct.new(:name).new("David") %></html> @@ -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 |