diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-28 07:33:54 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-28 07:33:54 +0000 |
| commit | cb0e27cee90c9417798c9d9db78dd0eb36c7fa24 (patch) | |
| tree | 21283c9ada0b6d25a6f9f16b8ef3e22a2626f5d0 /actionpack/lib/action_controller/layout.rb | |
| parent | fb61912798de245f22929808c11d07c612480471 (diff) | |
| download | rails-cb0e27cee90c9417798c9d9db78dd0eb36c7fa24.tar.gz rails-cb0e27cee90c9417798c9d9db78dd0eb36c7fa24.tar.bz2 rails-cb0e27cee90c9417798c9d9db78dd0eb36c7fa24.zip | |
Fix that render :text didn't interpolate instance variables (Closes #2629, #2626) [skaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2777 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 32f7864182..815a55739f 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -219,6 +219,7 @@ module ActionController #:nodoc: end erase_render_results + add_variables_to_assigns @template.instance_variable_set("@content_for_layout", content_for_layout) render_text(@template.render_file(layout, true), deprecated_status) else |