Ruby 1.9 compat: move from the deprecated Base64 module to ActiveSupport::Base64. Closes #10554.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8433 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 7 insertions, 8 deletions

diff --git a/actionpack/lib/action_controller/session/active_record_store.rb b/actionpack/lib/action_controller/session/active_record_store.rb
index 14747c5052..379fcd62b6 100644
--- a/actionpack/lib/action_controller/session/active_record_store.rb
+++ b/actionpack/lib/action_controller/session/active_record_store.rb
@@ -1,7 +1,6 @@
 require 'cgi'
 require 'cgi/session'
 require 'digest/md5'
-require 'base64'
 
 class CGI
   class Session
@@ -80,8 +79,8 @@ class CGI
             find_by_session_id(session_id)
           end
 
-          def marshal(data)   Base64.encode64(Marshal.dump(data)) if data end
-          def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
+          def marshal(data)   ActiveSupport::Base64.encode64(Marshal.dump(data)) if data end
+          def unmarshal(data) Marshal.load(ActiveSupport::Base64.decode64(data)) if data end
 
           def create_table!
             connection.execute <<-end_sql
@@ -155,8 +154,8 @@ class CGI
       # The database connection, table name, and session id and data columns
       # are configurable class attributes.  Marshaling and unmarshaling
       # are implemented as class methods that you may override.  By default,
-      # marshaling data is +Base64.encode64(Marshal.dump(data))+ and
-      # unmarshaling data is +Marshal.load(Base64.decode64(data))+.
+      # marshaling data is +ActiveSupport::Base64.encode64(Marshal.dump(data))+ and
+      # unmarshaling data is +Marshal.load(ActiveSupport::Base64.decode64(data))+.
       #
       # This marshaling behavior is intended to store the widest range of
       # binary session data in a +text+ column.  For higher performance,
@@ -190,8 +189,8 @@ class CGI
             end
           end
 
-          def marshal(data)   Base64.encode64(Marshal.dump(data)) if data end
-          def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
+          def marshal(data)   ActiveSupport::Base64.encode64(Marshal.dump(data)) if data end
+          def unmarshal(data) Marshal.load(ActiveSupport::Base64.decode64(data)) if data end
 
           def create_table!
             @@connection.execute <<-end_sql
@@ -333,4 +332,4 @@ class CGI
         end
     end
   end
-end
\ No newline at end of file
+end