aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-01-16 04:23:27 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-01-16 04:23:27 -0200
commitf5065ef60c011a0d84224e74e1e8a0b882c36223 (patch)
tree5632a7405e3e8f061d7ab9e3f0d1e7083d3aadd3 /actionview/lib
parentde2259791cd21e80d44ec7c7562324c73ff85699 (diff)
parent7c988f8030fa5b779041d682c12132ab4da47d1e (diff)
downloadrails-f5065ef60c011a0d84224e74e1e8a0b882c36223.tar.gz
rails-f5065ef60c011a0d84224e74e1e8a0b882c36223.tar.bz2
rails-f5065ef60c011a0d84224e74e1e8a0b882c36223.zip
Merge pull request #20046 from yoongkang/ladida
Use ActiveSupport::SafeBuffer when flushing content_for
Diffstat (limited to 'actionview/lib')
-rw-r--r--actionview/lib/action_view/flows.rb2
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