summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2009-12-07 17:07:15 +0100
committerDerek Allard <derek.allard@ellislab.com>2009-12-07 17:07:15 +0100
commit8dc2c7cb55e33e96bc82e61985553192c9af4ebd (patch)
treec88d888ae0b549a8d6a0548eb4930958587bc681
parent9fb6dd19f74c72cb98b6108a42575a98d3a9ba0c (diff)
Fixed an error in the Zip library that didn't allow downloading on PHP 4 servers.
-rw-r--r--system/libraries/Zip.php6
-rw-r--r--user_guide/changelog.html1
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