Psych correctly gets visitor for SafeBuffer from superclass

2011-01-19 17:10:01 +03:00 · 2011-01-19 17:10:01 +03:00 · eb33bd944d
commit eb33bd944d
parent 452dba72f5
1 changed files with 5 additions and 2 deletions
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@ -1,5 +1,6 @@
 require 'erb'
 require 'active_support/core_ext/kernel/singleton_class'
+require 'active_support/core_ext/yaml'

 class ERB
  module Util
@ -101,8 +102,10 @@ def to_s
      self
    end

-    def to_yaml(*args)
-      to_str.to_yaml(*args)
+    unless defined?(Psych)
+      def to_yaml(*args)
+        to_str.to_yaml(*args)
+      end
    end
  end
 end