summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-03-01 12:32:18 +0100
committerTimothy Warren <tim@timshomepage.net>2012-03-01 12:32:18 +0100
commit7842b1bc8cc007521dcc55de613d6e3224cfe2c1 (patch)
tree0631ea110b3e8b9de0159ffaab345926a3cd4884 /system/helpers
parent9a96082726feadadd50aef1287b4e0df61414c0d (diff)
parent76f15c9bb3004e6da99dd273c34ef3b92a23c17f (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/download_helper.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 34380cc88..a8c59c2c0 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -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'))