Merge pull request rails#4268 from lest/3-2-deprecate-activesupport-b…

…ase64 fix base64 requires
JEG2 · Jan 2, 2012 · e369c4e · e369c4e
2 parents 7bdfbac + 4f440a3
commit e369c4e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -1,4 +1,4 @@
-require 'base64'
+require 'active_support/base64'
 require 'active_support/core_ext/object/blank'
 
 module ActionController

diff --git a/activeresource/test/cases/authorization_test.rb b/activeresource/test/cases/authorization_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'active_support/base64'
 
 class AuthorizationTest < Test::Unit::TestCase
   Response = Struct.new(:code)

diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
@@ -1,5 +1,5 @@
 require 'openssl'
-require 'base64'
+require 'active_support/base64'
 
 module ActiveSupport
   # MessageEncryptor is a simple way to encrypt values which get stored somewhere

diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
@@ -1,4 +1,4 @@
-require 'base64'
+require 'active_support/base64'
 require 'active_support/core_ext/object/blank'
 
 module ActiveSupport

diff --git a/activesupport/lib/active_support/xml_mini.rb b/activesupport/lib/active_support/xml_mini.rb
@@ -1,4 +1,5 @@
 require 'time'
+require 'active_support/base64'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/inflections'