AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

delete can take a block and allow nil to be returned

Browse Source
This commit is contained in:
Greg Ose
2014-05-20 13:35:41 -05:00
parent 1f59a8dfe8
commit 1b98a0d72f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
actionpack/lib/action_controller/session/abstract_store.rb
View File

@@ -55,8 +55,7 @@ module ActionController
def [](key)
load_for_read!
string_value = super(key.to_s)
string_value.nil? ? super(key) : string_value
fetch(key.to_s, super(key))
end
def has_key?(key)
@@ -88,9 +87,14 @@ module ActionController
def delete(key)
load_for_write!
value = super(key)
string_value = super(key.to_s)
string_value.nil? ? value : string_value
if has_key? key
value = self[key]
super(key)
super(key.to_s)
value
else
super
end
end
def data