From a9ad763c86e110c280be0b7a763496f9e1204de0 Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Wed, 17 Jun 2009 18:08:45 -0700 Subject: Drive the final stake through @content_for_*'s heart! --- actionpack/test/fixtures/layouts/builder.builder | 2 +- actionpack/test/fixtures/layouts/standard.html.erb | 2 +- actionpack/test/fixtures/layouts/talk_from_action.erb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/fixtures/layouts/builder.builder b/actionpack/test/fixtures/layouts/builder.builder index 729af4b8bc..7c7d4b2dd1 100644 --- a/actionpack/test/fixtures/layouts/builder.builder +++ b/actionpack/test/fixtures/layouts/builder.builder @@ -1,3 +1,3 @@ xml.wrapper do - xml << @content_for_layout + xml << yield end \ No newline at end of file diff --git a/actionpack/test/fixtures/layouts/standard.html.erb b/actionpack/test/fixtures/layouts/standard.html.erb index 368764e6f4..5e6c24fe39 100644 --- a/actionpack/test/fixtures/layouts/standard.html.erb +++ b/actionpack/test/fixtures/layouts/standard.html.erb @@ -1 +1 @@ -<%= @content_for_layout %><%= @variable_for_layout %> \ No newline at end of file +<%= yield %><%= @variable_for_layout %> \ No newline at end of file diff --git a/actionpack/test/fixtures/layouts/talk_from_action.erb b/actionpack/test/fixtures/layouts/talk_from_action.erb index 187aab07a2..bf53fdb785 100644 --- a/actionpack/test/fixtures/layouts/talk_from_action.erb +++ b/actionpack/test/fixtures/layouts/talk_from_action.erb @@ -1,2 +1,2 @@ -<%= @title || @content_for_title %> -<%= @content_for_layout -%> \ No newline at end of file +<%= @title || yield(:title) %> +<%= yield -%> \ No newline at end of file -- cgit v1.2.3