From 80f4c34d1c5a51d82ae3dd898a12466e01790f10 Mon Sep 17 00:00:00 2001
From: Ben Edmunds <ben.edmunds@gmail.com>
Date: Sat, 20 Aug 2011 14:11:21 -0500
Subject: Resolved issue 160.  Removed unneeded array copy.

---
 system/libraries/Cache/drivers/Cache_file.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php
index 13e2d1af6..edb48acb6 100644
--- a/system/libraries/Cache/drivers/Cache_file.php
+++ b/system/libraries/Cache/drivers/Cache_file.php
@@ -157,16 +157,15 @@ class CI_Cache_file extends CI_Driver {
 		
 		if (is_array($data))
 		{
-			$data = $data['data'];
 			$mtime = filemtime($this->_cache_path.$id);
 
-			if ( ! isset($data['ttl']))
+			if ( ! isset($data['data']['ttl']))
 			{
 				return FALSE;
 			}
 
 			return array(
-				'expire' 	=> $mtime + $data['ttl'],
+				'expire' 	=> $mtime + $data['data']['ttl'],
 				'mtime'		=> $mtime
 			);
 		}
-- 
cgit v1.2.3-24-g4f1b


From 3db2849dcf104127aee23ee69ba67011ebdfa91c Mon Sep 17 00:00:00 2001
From: Ben Edmunds <ben.edmunds@gmail.com>
Date: Sat, 20 Aug 2011 14:12:12 -0500
Subject: Resolved issue 48.  Removed unneeded array copy.

---
 system/libraries/Cache/drivers/Cache_file.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php
index edb48acb6..6c37e7005 100644
--- a/system/libraries/Cache/drivers/Cache_file.php
+++ b/system/libraries/Cache/drivers/Cache_file.php
@@ -165,8 +165,8 @@ class CI_Cache_file extends CI_Driver {
 			}
 
 			return array(
-				'expire' 	=> $mtime + $data['data']['ttl'],
-				'mtime'		=> $mtime
+				'expire' => $mtime + $data['data']['ttl'],
+				'mtime'	 => $mtime
 			);
 		}
 		
-- 
cgit v1.2.3-24-g4f1b


From 5483872727be793366c4bed9f3a837cd9e63a045 Mon Sep 17 00:00:00 2001
From: Ben Edmunds <ben.edmunds@gmail.com>
Date: Sat, 20 Aug 2011 17:48:31 -0500
Subject: Added notes to changelog

---
 user_guide/changelog.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 88b4363ea..d3e6eefbb 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -95,6 +95,7 @@ Change Log
 	<li class="reactor">If a config class was loaded first then a library with the same name is loaded, the config would be ignored.</li>
 	<li class="reactor">Fixed a bug (Reactor #19) where 1) the 404_override route was being ignored in some cases, and 2) auto-loaded libraries were not available to the 404_override controller when a controller existed but the requested method did not.</li>
 	<li class="rector">Fixed a bug (Reactor #89) where MySQL export would fail if the table had hyphens or other non alphanumeric/underscore characters.</li>
+	<li class="reactor">Resolved issue 160.  Removed unneeded array copy.</li>
 </ul>
 
 <h2>Version 2.0.3</h2>
-- 
cgit v1.2.3-24-g4f1b