diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 18:08:45 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 18:08:45 -0700 |
| commit | a9ad763c86e110c280be0b7a763496f9e1204de0 (patch) | |
| tree | f3f6fe2d86a4536cae6f1a9a7ddf73d67c59f2e0 /actionpack/test/fixtures | |
| parent | 65102c8f1a55c8d73e44b62eed5e689017ace7cd (diff) | |
| download | rails-a9ad763c86e110c280be0b7a763496f9e1204de0.tar.gz rails-a9ad763c86e110c280be0b7a763496f9e1204de0.tar.bz2 rails-a9ad763c86e110c280be0b7a763496f9e1204de0.zip | |
Drive the final stake through @content_for_*'s heart!
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/layouts/builder.builder | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/layouts/standard.html.erb | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/layouts/talk_from_action.erb | 4 |
3 files changed, 4 insertions, 4 deletions
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 @@ -<html><%= @content_for_layout %><%= @variable_for_layout %></html>
\ No newline at end of file +<html><%= yield %><%= @variable_for_layout %></html>
\ 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><%= @title || @content_for_title %></title> -<%= @content_for_layout -%>
\ No newline at end of file +<title><%= @title || yield(:title) %></title> +<%= yield -%>
\ No newline at end of file |