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/lib | |
| 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/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/capture_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb index 1877730c7e..d430121b04 100644 --- a/actionpack/lib/action_view/helpers/capture_helper.rb +++ b/actionpack/lib/action_view/helpers/capture_helper.rb @@ -82,9 +82,9 @@ module ActionView # NOTE: Beware that content_for is ignored in caches. So you shouldn't use it # for elements that are going to be fragment cached. def content_for(name, &block) - base = controller.instance_variable_get(instance_var_name(name)) || "" + base = instance_variable_get(instance_var_name(name)) || "" data = capture(&block) - controller.instance_variable_set(instance_var_name(name), base + data) + instance_variable_set(instance_var_name(name), base + data) data end |