summaryrefslogtreecommitdiffstats
path: root/system/helpers/download_helper.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-10 14:44:57 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-10 14:44:57 +0100
commitc857bc23d35840a9c3b13ce752ae832385639f73 (patch)
treea864a7600d37ca110c3e44c06cc1b55170ad272c /system/helpers/download_helper.php
parent172331d40c991741c76fcf70f4262c2db821c6f8 (diff)
parent52a31ba3acc5f5be16692ac25c70780775e548e0 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-dh-date-range
Diffstat (limited to 'system/helpers/download_helper.php')
-rw-r--r--system/helpers/download_helper.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 34380cc88..f3f0ff2ca 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -2,7 +2,7 @@
/**
* CodeIgniter
*
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
*
@@ -70,7 +70,8 @@ if ( ! function_exists('force_download'))
return FALSE;
}
- $extension = end(explode('.', $filename));
+ $extension = explode('.', $filename);
+ $extension = end($extension);
// Load the mime types
if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
@@ -90,7 +91,7 @@ if ( ! function_exists('force_download'))
}
// Generate the server headers
- header('Content-Type: "'.$mime.'"');
+ header('Content-Type: '.$mime);
header('Content-Disposition: attachment; filename="'.$filename.'"');
header('Expires: 0');
header('Content-Transfer-Encoding: binary');