diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-09 19:30:02 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-09 19:30:02 -0800 |
| commit | 08f7c4dd8951053c443371f786be59d04448c225 (patch) | |
| tree | 0365f3744e40e79e1421872ec1687070c88ede36 /activesupport/lib/active_support/ruby | |
| parent | 703d31c20a7b531053d5c009972a89e857b07376 (diff) | |
| download | rails-08f7c4dd8951053c443371f786be59d04448c225.tar.gz rails-08f7c4dd8951053c443371f786be59d04448c225.tar.bz2 rails-08f7c4dd8951053c443371f786be59d04448c225.zip | |
Revert "the REXML security fix is not needed for Ruby >= 1.8.7"
Still required on older 1.8.7 patchlevels.
This reverts commit a48f49e56bf53e0a2386da898576ef12d5258358.
Diffstat (limited to 'activesupport/lib/active_support/ruby')
| -rw-r--r-- | activesupport/lib/active_support/ruby/shim.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb index af6e8aa91e..f811239077 100644 --- a/activesupport/lib/active_support/ruby/shim.rb +++ b/activesupport/lib/active_support/ruby/shim.rb @@ -5,6 +5,7 @@ # DateTime to_date, to_datetime, xmlschema # Enumerable group_by, each_with_object, none? # Process Process.daemon +# REXML security fix # String ord # Time to_date, to_time, to_datetime require 'active_support' @@ -13,4 +14,5 @@ require 'active_support/core_ext/date_time/conversions' require 'active_support/core_ext/enumerable' require 'active_support/core_ext/process/daemon' require 'active_support/core_ext/string/conversions' +require 'active_support/core_ext/rexml' require 'active_support/core_ext/time/conversions' |