diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-09-13 05:56:30 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-09-13 05:57:44 -0700 |
commit | c2018b4b7b50b1c4aa89ff61cf0099229c3669a1 (patch) | |
tree | 52be4d9b934a9a33fe76ca0d49a3dd5d67da5c04 /activesupport | |
parent | 7e6652edbf87d26489d2b68cfa29abeb2ab588c7 (diff) | |
download | rails-c2018b4b7b50b1c4aa89ff61cf0099229c3669a1.tar.gz rails-c2018b4b7b50b1c4aa89ff61cf0099229c3669a1.tar.bz2 rails-c2018b4b7b50b1c4aa89ff61cf0099229c3669a1.zip |
Shush, rexml
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/core_ext/rexml.rb | 4 | ||||
-rw-r--r-- | activesupport/lib/active_support/xml_mini/rexml.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/rexml.rb b/activesupport/lib/active_support/core_ext/rexml.rb index decc4f6d9c..8fde1553f6 100644 --- a/activesupport/lib/active_support/core_ext/rexml.rb +++ b/activesupport/lib/active_support/core_ext/rexml.rb @@ -5,11 +5,11 @@ require 'rexml/rexml' # Earlier versions of rexml defined REXML::Version, newer ones REXML::VERSION unless (defined?(REXML::VERSION) ? REXML::VERSION : REXML::Version) > "3.1.7.2" - require 'rexml/document' + silence_warnings { require 'rexml/document' } # REXML in 1.8.7 has the patch but early patchlevels didn't update Version from 3.1.7.2. unless REXML::Document.respond_to?(:entity_expansion_limit=) - require 'rexml/entity' + silence_warnings { require 'rexml/entity' } module REXML #:nodoc: class Entity < Child #:nodoc: diff --git a/activesupport/lib/active_support/xml_mini/rexml.rb b/activesupport/lib/active_support/xml_mini/rexml.rb index aaf4bb6bfd..bfed11fefb 100644 --- a/activesupport/lib/active_support/xml_mini/rexml.rb +++ b/activesupport/lib/active_support/xml_mini/rexml.rb @@ -24,7 +24,7 @@ module ActiveSupport {} else data.ungetc(char) - require 'rexml/document' unless defined?(REXML::Document) + silence_warnings { require 'rexml/document' } unless defined?(REXML::Document) doc = REXML::Document.new(data) merge_element!({}, doc.root) end |