From fcd6cd77efe26f94d4a9c42173d60adcc524c0ed Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 18 Jun 2011 16:44:34 -0500 Subject: [PATCH] fixed messed up commit of file cache driver. --- system/cache/driver/file.php | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/system/cache/driver/file.php b/system/cache/driver/file.php index dfe4eb55..852bdb15 100644 --- a/system/cache/driver/file.php +++ b/system/cache/driver/file.php @@ -1,6 +1,6 @@ items)) @@ -34,14 +34,25 @@ class Memcached implements \System\Cache\Driver { return $this->items[$key]; } - $cache = \System\Memcached::instance()->get(\System\Config::get('cache.key').$key); - - if ($cache === false) + if ( ! file_exists(APP_PATH.'cache/'.$key)) { return $default; } - return $this->items[$key] = $cache; + $cache = file_get_contents(APP_PATH.'cache/'.$key); + + // -------------------------------------------------- + // Has the cache expired? The UNIX expiration time + // is stored at the beginning of the file. + // -------------------------------------------------- + if (time() >= substr($cache, 0, 10)) + { + $this->forget($key); + + return $default; + } + + return $this->items[$key] = unserialize(substr($cache, 10)); } /** @@ -54,7 +65,7 @@ class Memcached implements \System\Cache\Driver { */ public function put($key, $value, $minutes) { - \System\Memcached::instance()->set(\System\Config::get('cache.key').$key, $value, 0, $minutes * 60); + file_put_contents(APP_PATH.'cache/'.$key, (time() + ($minutes * 60)).serialize($value), LOCK_EX); } /** @@ -65,7 +76,7 @@ class Memcached implements \System\Cache\Driver { */ public function forget($key) { - \System\Memcached::instance()->delete(\System\Config::get('cache.key').$key); + @unlink(APP_PATH.'cache/'.$key); } } \ No newline at end of file