summaryrefslogtreecommitdiffstats
path: root/system/libraries/Cache/drivers
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-10-08 18:04:12 +0200
committerFlorian Pritz <bluewind@xinu.at>2012-10-08 18:04:12 +0200
commit74dcbbf816deb0cb05e43f1843f6b84b51966470 (patch)
treeb4ceb0a46fb54366d8943325d9e91895e78a03c0 /system/libraries/Cache/drivers
parentb12d7cb03ab1ef63baab4a8d4b1380e6990c1437 (diff)
parent05e8c03b6742033cf88885cb86217cadca3a4567 (diff)
Merge tag '2.1.3'
Conflicts: user_guide Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/libraries/Cache/drivers')
-rwxr-xr-xsystem/libraries/Cache/drivers/Cache_file.php11
1 files changed, 5 insertions, 6 deletions
diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php
index c50043660..e515eebf1 100755
--- a/system/libraries/Cache/drivers/Cache_file.php
+++ b/system/libraries/Cache/drivers/Cache_file.php
@@ -151,13 +151,12 @@ class CI_Cache_file extends CI_Driver {
{
return FALSE;
}
-
- $data = read_file($this->_cache_path.$id);
+
+ $data = read_file($this->_cache_path.$id);
$data = unserialize($data);
-
+
if (is_array($data))
{
- $data = $data['data'];
$mtime = filemtime($this->_cache_path.$id);
if ( ! isset($data['ttl']))
@@ -166,11 +165,11 @@ class CI_Cache_file extends CI_Driver {
}
return array(
- 'expire' => $mtime + $data['ttl'],
+ 'expire' => $mtime + $data['ttl'],
'mtime' => $mtime
);
}
-
+
return FALSE;
}