diff options
| author | Yoong Kang Lim <yoongkang.lim@gmail.com> | 2015-05-06 23:31:49 +1000 |
|---|---|---|
| committer | Yoong Kang Lim <yoongkang.lim@gmail.com> | 2015-05-25 22:13:03 +1000 |
| commit | 7c988f8030fa5b779041d682c12132ab4da47d1e (patch) | |
| tree | 565e562c0861aa7dec32452a4a5c6b1a2a392747 /actionview/lib/action_view/flows.rb | |
| parent | d0a370ec93c7e1118f3f58effe2e64712d3492bd (diff) | |
| download | rails-7c988f8030fa5b779041d682c12132ab4da47d1e.tar.gz rails-7c988f8030fa5b779041d682c12132ab4da47d1e.tar.bz2 rails-7c988f8030fa5b779041d682c12132ab4da47d1e.zip | |
Use ActiveSupport::SafeBuffer when flushing content_for
Previously, when content_for is flushed, the content
was replaced directly by a new value in
ActionView::OutputFlow#set. The problem is this new
value passed to the method may not be an instance of
ActiveSupport::SafeBuffer.
This change forces the value to be set to a new
instance of ActiveSupport::SafeBuffer.
Diffstat (limited to 'actionview/lib/action_view/flows.rb')
| -rw-r--r-- | actionview/lib/action_view/flows.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/flows.rb b/actionview/lib/action_view/flows.rb index ba24510e56..bc61920848 100644 --- a/actionview/lib/action_view/flows.rb +++ b/actionview/lib/action_view/flows.rb @@ -15,7 +15,7 @@ module ActionView # Called by each renderer object to set the layout contents. def set(key, value) - @content[key] = value + @content[key] = ActiveSupport::SafeBuffer.new(value) end # Called by content_for |