Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak file cache driver to return null as default.

This commit is contained in:
Taylor Otwell 2011-07-07 07:40:42 -07:00
parent 9927e3ed4e
commit 577066e07e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
system/cache/driver/file.php vendored
View File

@ -27,7 +27,7 @@ public function has($key)
* @param mixed $default * @param mixed $default
* @return mixed * @return mixed
*/ */
public function get($key, $default = null) public function get($key)
{ {
if (array_key_exists($key, $this->items)) if (array_key_exists($key, $this->items))
{ {
@ -36,17 +36,14 @@ public function get($key, $default = null)
if ( ! file_exists(APP_PATH.'storage/cache/'.$key)) if ( ! file_exists(APP_PATH.'storage/cache/'.$key))
{ {
return is_callable($default) ? call_user_func($default) : $default; return null;
} }
$cache = file_get_contents(APP_PATH.'storage/cache/'.$key); $cache = file_get_contents(APP_PATH.'storage/cache/'.$key);
// Has the cache expired? The UNIX expiration time is stored at the beginning of the file.
if (time() >= substr($cache, 0, 10)) if (time() >= substr($cache, 0, 10))
{ {
$this->forget($key); return $this->forget($key);
return is_callable($default) ? call_user_func($default) : $default;
} }
return $this->items[$key] = unserialize(substr($cache, 10)); return $this->items[$key] = unserialize(substr($cache, 10));