From 23a0e2c4a9c41936fec0c6e44b946108c701d33b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 9 Sep 2008 23:07:34 -0500 Subject: Fixed that REXML fix would break on earlier versions of ruby (Frederick Cheung) [state:resolved #987] --- activesupport/lib/active_support/core_ext/rexml.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/activesupport/lib/active_support/core_ext/rexml.rb b/activesupport/lib/active_support/core_ext/rexml.rb index af8ce3af47..baced8111a 100644 --- a/activesupport/lib/active_support/core_ext/rexml.rb +++ b/activesupport/lib/active_support/core_ext/rexml.rb @@ -5,7 +5,9 @@ require 'rexml/entity' # 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 -unless REXML::VERSION > "3.1.7.2" +#earlier versions of rexml defined REXML::Version, newer ones REXML::VERSION +version = defined?(REXML::VERSION) ? REXML::VERSION : REXML::Version +unless version > "3.1.7.2" module REXML class Entity < Child undef_method :unnormalized -- cgit v1.2.3