diff options
author | Xavier Noria <fxn@hashref.com> | 2012-01-02 14:00:32 -0800 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2012-01-02 14:00:32 -0800 |
commit | 7bdfbac580f7b03953f2aabf610d98c437da376e (patch) | |
tree | c130e4279ffee79d0cd6a69610480ff9eb9ca0d1 /activerecord/lib | |
parent | 6e9cd3846811718611543dae049c000076319587 (diff) | |
parent | 5f09414f85edfa60ab54ce8b9f8b03874e0670dc (diff) | |
download | rails-7bdfbac580f7b03953f2aabf610d98c437da376e.tar.gz rails-7bdfbac580f7b03953f2aabf610d98c437da376e.tar.bz2 rails-7bdfbac580f7b03953f2aabf610d98c437da376e.zip |
Merge pull request #4267 from lest/3-2-deprecate-activesupport-base64
deprecate ActiveSupport::Base64
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/session_store.rb | 8 |
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, |