From f10631e13d373523c1ede9c73a5d7eb2e0529a27 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 11 Mar 2010 18:37:28 -0800 Subject: Be sure to pass through args to to_yaml --- activesupport/lib/active_support/core_ext/string/output_safety.rb | 4 ++-- activesupport/test/core_ext/string_ext_test.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb index 3a49cd288b..af46ae10d6 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -93,8 +93,8 @@ module ActiveSupport #:nodoc: ''.replace(self) end - def to_yaml - as_str.to_yaml + def to_yaml(*args) + as_str.to_yaml(*args) end end end diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index 6b296fb757..a50e259726 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -446,7 +446,7 @@ class OutputSafetyTest < ActiveSupport::TestCase end test 'emits normal string yaml' do - assert_equal 'foo'.to_yaml, 'foo'.html_safe.to_yaml + assert_equal 'foo'.to_yaml, 'foo'.html_safe.to_yaml(:foo => 1) end end -- cgit v1.2.3