diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-24 13:20:29 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-24 13:20:29 +0000 |
| commit | 1ae0a53d861c43dff8883fc956a08404c23f180c (patch) | |
| tree | 25f85878792f5bcd655872ed3bd0fecce6369a65 /actionpack/test/fixtures/layouts | |
| parent | b25f9af998ad26653083e004b7a6cb9ca0061940 (diff) | |
| download | rails-1ae0a53d861c43dff8883fc956a08404c23f180c.tar.gz rails-1ae0a53d861c43dff8883fc956a08404c23f180c.tar.bz2 rails-1ae0a53d861c43dff8883fc956a08404c23f180c.zip | |
Fixed regression for content_for #1820 [Stefan Kaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1911 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/fixtures/layouts')
| -rw-r--r-- | actionpack/test/fixtures/layouts/talk_from_action.rhtml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/fixtures/layouts/talk_from_action.rhtml b/actionpack/test/fixtures/layouts/talk_from_action.rhtml index 215dfd27ac..187aab07a2 100644 --- a/actionpack/test/fixtures/layouts/talk_from_action.rhtml +++ b/actionpack/test/fixtures/layouts/talk_from_action.rhtml @@ -1,2 +1,2 @@ -<title><%= @title %></title> +<title><%= @title || @content_for_title %></title> <%= @content_for_layout -%>
\ No newline at end of file |