From e06c5bef7f73e05e6867343ec0bf3091b8eb0a92 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 24 Nov 2008 11:05:07 -0800 Subject: Revert "Hack builder to look for fast_xs instead of insisting on its own String#to_xs" This reverts commit 5d3712a81e502f46b2745d238d9bb76fcdb31f5b. --- .../lib/active_support/vendor/builder-2.1.2/builder/xchar.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport/lib/active_support/vendor/builder-2.1.2/builder') diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb index a1990be37a..8bdbd05899 100644 --- a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb +++ b/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb @@ -18,6 +18,7 @@ module Builder end if ! defined?(Builder::XChar) + Builder.check_for_name_collision(String, "to_xs") Builder.check_for_name_collision(Fixnum, "xchr") end @@ -104,12 +105,11 @@ end # Enhance the String class with a XML escaped character version of # to_s. # -require 'active_support/core_ext/string/xchar' class String # XML escaped version of to_s def to_xs unpack('U*').map {|n| n.xchr}.join # ASCII, UTF-8 rescue unpack('C*').map {|n| n.xchr}.join # ISO-8859-1, WIN-1252 - end unless method_defined?(:to_xs) + end end -- cgit v1.2.3