From 8dc2c7cb55e33e96bc82e61985553192c9af4ebd Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Mon, 7 Dec 2009 16:07:15 +0000
Subject: Fixed an error in the Zip library that didn't allow downloading on
 PHP 4 servers.

---
 system/libraries/Zip.php  | 6 ++++--
 user_guide/changelog.html | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index f81da856c..4ed1f1820 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -325,11 +325,13 @@ class CI_Zip  {
 			$filename .= '.zip';
 		}
 
-		$zip_content =& $this->get_zip();
-
 		$CI =& get_instance();
 		$CI->load->helper('download');
 
+		$get_zip = $this->get_zip();
+
+		$zip_content =& $get_zip;
+
 		force_download($filename, $zip_content);
 	}
 
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 116aaa64d..4411aebfa 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -65,6 +65,7 @@ SVN Revision: </p>
 	<li>Libraries
 		<ul>
 			<li>Documented a second argument in the <kbd>decode()</kbd> function for the <a href="libraries/encryption.html">Encryption Class</a>.</li>
+			<li>Fixed an error in the Zip library that didn't allow downloading on PHP 4 servers.</li>
 		</ul>
 	</li>
 	<li>Helpers
-- 
cgit v1.2.3-24-g4f1b