aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSergey Nartimov <just.lest@gmail.com>2012-01-01 20:57:55 +0300
committerSergey Nartimov <just.lest@gmail.com>2012-01-02 22:48:15 +0300
commit0f2f8003d2351079ce6ec0e706e474d8024839cc (patch)
treebae06d09fd0a6904936244feae7ddf698ef97187 /activerecord
parentf3e079e8b54da1c4d0511495ced3f68c1b7a46f1 (diff)
downloadrails-0f2f8003d2351079ce6ec0e706e474d8024839cc.tar.gz
rails-0f2f8003d2351079ce6ec0e706e474d8024839cc.tar.bz2
rails-0f2f8003d2351079ce6ec0e706e474d8024839cc.zip
remove ActiveSupport::Base64 in favor of ::Base64
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/session_store.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index e3bbd06f7e..1029bed064 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -51,11 +51,11 @@ module ActiveRecord
class SessionStore < ActionDispatch::Session::AbstractStore
module ClassMethods # :nodoc:
def marshal(data)
- ActiveSupport::Base64.encode64(Marshal.dump(data)) if data
+ ::Base64.encode64(Marshal.dump(data)) if data
end
def unmarshal(data)
- Marshal.load(ActiveSupport::Base64.decode64(data)) if data
+ Marshal.load(::Base64.decode64(data)) if data
end
def drop_table!
@@ -169,11 +169,11 @@ module ActiveRecord
# are implemented as class methods that you may override. By default,
# marshaling data is
#
- # ActiveSupport::Base64.encode64(Marshal.dump(data))
+ # ::Base64.encode64(Marshal.dump(data))
#
# and unmarshaling data is
#
- # Marshal.load(ActiveSupport::Base64.decode64(data))
+ # Marshal.load(::Base64.decode64(data))
#
# This marshaling behavior is intended to store the widest range of
# binary session data in a +text+ column. For higher performance,