aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-03-28 11:06:46 -0700
committerwycats <wycats@gmail.com>2010-03-28 11:06:46 -0700
commitc99194c7bed6744104e114ab231ef39158044a63 (patch)
tree9566ad06335bf96d4c32e421c2d25b4676b3e0d3 /activesupport/lib/active_support
parent835f5d0269a8d3615585119e77f1ba7d601c943b (diff)
parentf1e5a9ff982998c31c9dedf2fa79180c7dea820a (diff)
downloadrails-c99194c7bed6744104e114ab231ef39158044a63.tar.gz
rails-c99194c7bed6744104e114ab231ef39158044a63.tar.bz2
rails-c99194c7bed6744104e114ab231ef39158044a63.zip
Merge remote branch 'rizwan/restrict'
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/xml_mini/libxmlsax.rb1
-rw-r--r--activesupport/lib/active_support/xml_mini/nokogirisax.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/xml_mini/libxmlsax.rb b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
index d7b2f4c5be..fe2c1b9349 100644
--- a/activesupport/lib/active_support/xml_mini/libxmlsax.rb
+++ b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
@@ -1,4 +1,5 @@
require 'libxml'
+require 'active_support/core_ext/object/blank'
# = XmlMini LibXML implementation using a SAX-based parser
module ActiveSupport
diff --git a/activesupport/lib/active_support/xml_mini/nokogirisax.rb b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
index d538a9110f..8af7b5e565 100644
--- a/activesupport/lib/active_support/xml_mini/nokogirisax.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
@@ -1,4 +1,5 @@
require 'nokogiri'
+require 'active_support/core_ext/object/blank'
# = XmlMini Nokogiri implementation using a SAX-based parser
module ActiveSupport