From 50c7aab996baafdfee4b1e4b2ca4673ee76bb19a Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Thu, 11 Nov 2010 01:30:40 -0200 Subject: Fix issue with rendering partials and then yielding inside a render layout call The given block was never being executed when another render :partial call existed before the yield call, due to the block being overriden. This commit also adds some more tests to render with :layout option. --- actionpack/test/fixtures/layouts/_partial_and_yield.erb | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 actionpack/test/fixtures/layouts/_partial_and_yield.erb (limited to 'actionpack/test/fixtures/layouts/_partial_and_yield.erb') diff --git a/actionpack/test/fixtures/layouts/_partial_and_yield.erb b/actionpack/test/fixtures/layouts/_partial_and_yield.erb new file mode 100644 index 0000000000..74cc428ffa --- /dev/null +++ b/actionpack/test/fixtures/layouts/_partial_and_yield.erb @@ -0,0 +1,2 @@ +<%= render :partial => 'test/partial' %> +<%= yield %> -- cgit v1.2.3