diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index ba15544d74..9aa4969a6b 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *1.1.2* (April 9th, 2005) +* Change the scaffolding layout to use yield rather than @content_for_layout. [Marcel Molina Jr.] + * Added rake rails:update:configs to update config/boot.rb from the latest (also included in rake rails:update) [DHH] * Fixed that boot.rb would set RAILS_GEM_VERSION twice, not respect an uncommented RAILS_GEM_VERSION line, and not use require_gem [DHH] diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml index 3e969b9ac4..b5ba9a4e99 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/layout.rhtml @@ -7,7 +7,7 @@ <p style="color: green"><%%= flash[:notice] %></p> -<%%= @content_for_layout %> +<%%= yield %> </body> </html> |