- Timestamp:
- 12/18/07 21:14:07 (7 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/session/active_record_store.rb
r7438 r8433 2 2 require 'cgi/session' 3 3 require 'digest/md5' 4 require 'base64'5 4 6 5 class CGI … … 81 80 end 82 81 83 def marshal(data) Base64.encode64(Marshal.dump(data)) if data end84 def unmarshal(data) Marshal.load( Base64.decode64(data)) if data end82 def marshal(data) ActiveSupport::Base64.encode64(Marshal.dump(data)) if data end 83 def unmarshal(data) Marshal.load(ActiveSupport::Base64.decode64(data)) if data end 85 84 86 85 def create_table! … … 156 155 # are configurable class attributes. Marshaling and unmarshaling 157 156 # are implemented as class methods that you may override. By default, 158 # marshaling data is + Base64.encode64(Marshal.dump(data))+ and159 # unmarshaling data is +Marshal.load( Base64.decode64(data))+.157 # marshaling data is +ActiveSupport::Base64.encode64(Marshal.dump(data))+ and 158 # unmarshaling data is +Marshal.load(ActiveSupport::Base64.decode64(data))+. 160 159 # 161 160 # This marshaling behavior is intended to store the widest range of … … 191 190 end 192 191 193 def marshal(data) Base64.encode64(Marshal.dump(data)) if data end194 def unmarshal(data) Marshal.load( Base64.decode64(data)) if data end192 def marshal(data) ActiveSupport::Base64.encode64(Marshal.dump(data)) if data end 193 def unmarshal(data) Marshal.load(ActiveSupport::Base64.decode64(data)) if data end 195 194 196 195 def create_table!
