diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 10:53:12 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 10:53:12 -0500 |
| commit | 3b325d624ccb5b390356d61a3ba72f09709066a4 (patch) | |
| tree | e9b375d262786906676866594a6fb5c41d4a1632 | |
| parent | 941e99041048e701e247ac8c7bf068fc3816b040 (diff) | |
| download | rails-3b325d624ccb5b390356d61a3ba72f09709066a4.tar.gz rails-3b325d624ccb5b390356d61a3ba72f09709066a4.tar.bz2 rails-3b325d624ccb5b390356d61a3ba72f09709066a4.zip | |
require reporting before attempting to "shush"
| -rw-r--r-- | activesupport/lib/active_support/core_ext/rexml.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/xml_mini/rexml.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/rexml.rb b/activesupport/lib/active_support/core_ext/rexml.rb index 8fde1553f6..5288b639a6 100644 --- a/activesupport/lib/active_support/core_ext/rexml.rb +++ b/activesupport/lib/active_support/core_ext/rexml.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/kernel/reporting' + # Fixes the rexml vulnerability disclosed at: # http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/ # This fix is identical to rexml-expansion-fix version 1.0.1 diff --git a/activesupport/lib/active_support/xml_mini/rexml.rb b/activesupport/lib/active_support/xml_mini/rexml.rb index bfed11fefb..3db48ce5a3 100644 --- a/activesupport/lib/active_support/xml_mini/rexml.rb +++ b/activesupport/lib/active_support/xml_mini/rexml.rb @@ -1,3 +1,4 @@ +require 'active_support/core_ext/kernel/reporting' require 'active_support/core_ext/object/blank' # = XmlMini ReXML implementation |