From 4f440a38330deea048e8328431c0984a04a90bfa Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Tue, 3 Jan 2012 01:04:03 +0300
Subject: [PATCH] fix base64 requires

---
 actionpack/lib/action_controller/metal/http_authentication.rb | 2 +-
 activeresource/test/cases/authorization_test.rb               | 1 +
 activesupport/lib/active_support/message_encryptor.rb         | 2 +-
 activesupport/lib/active_support/message_verifier.rb          | 2 +-
 activesupport/lib/active_support/xml_mini.rb                  | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index 3be2e840b8cc8..edff40a483c25 100644
--- 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
index dabc40dfe7d04..e3e8182a118d9 100644
--- 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
index 535eec44856e0..abe9c938afba4 100644
--- 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
index bbb239e1948b5..be5b7ef79f697 100644
--- 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
index 4df3fd0efa602..a4ac1d7041ddc 100644
--- 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'