Fix issue bcit-ci#1543

narfbg · narfbg · commit bd0b4b306fd9 · 2012-07-02T15:48:35.000+03:00
diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php
@@ -151,13 +151,12 @@ public function get_metadata($id)
 		{
 			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 @@ public function get_metadata($id)
 			}
 
 			return array(
-				'expire' 	=> $mtime + $data['ttl'],
+				'expire'	=> $mtime + $data['ttl'],
 				'mtime'		=> $mtime
 			);
 		}
-		
+
 		return FALSE;
 	}
 
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
@@ -57,6 +57,14 @@
 
 <h1>Change Log</h1>
 
+<h2>Version 2.1.3</h2>
+<p>Release Date: Not Released</p>
+
+<h3>Bug fixes for 2.1.3:</h3>
+<ul>
+	<li>Fixed a bug (#1543) - <a href="libraries/caching.html#file">File-based Caching</a> method <samp>get_metadata()</samp> used a non-existent array key to look for the TTL value.</li>
+</ul>
+
 <h2>Version 2.1.2</h2>
 <p>Release Date: June 29, 2012</p>
 

Original file line number	Diff line number	Diff line change
`@@ -151,13 +151,12 @@ public function get_metadata($id)`
`151`	`151`	`{`
`152`	`152`	`return FALSE;`
`153`	`153`	`}`
`154`		`-`
`155`		`- $data = read_file($this->_cache_path.$id);`
	`154`	`+`
	`155`	`+ $data = read_file($this->_cache_path.$id);`
`156`	`156`	`$data = unserialize($data);`
`157`		`-`
	`157`	`+`
`158`	`158`	`if (is_array($data))`
`159`	`159`	`{`
`160`		`- $data = $data['data'];`
`161`	`160`	`$mtime = filemtime($this->_cache_path.$id);`
`162`	`161`
`163`	`162`	`if ( ! isset($data['ttl']))`
`@@ -166,11 +165,11 @@ public function get_metadata($id)`
`166`	`165`	`}`
`167`	`166`
`168`	`167`	`return array(`
`169`		`- 'expire' => $mtime + $data['ttl'],`
	`168`	`+ 'expire' => $mtime + $data['ttl'],`
`170`	`169`	`'mtime' => $mtime`
`171`	`170`	`);`
`172`	`171`	`}`
`173`		`-`
	`172`	`+`
`174`	`173`	`return FALSE;`
`175`	`174`	`}`
`176`	`175`