summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-01 14:01:58 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-01 14:01:58 +0100
commit3aaca2523de1a733c18473299cd3c72c9497869c (patch)
tree11d88239a0625e201c06f7bd78572862e6425a6c /system/helpers
parent005700340b444f3cfee8df98f5bf30b32c4a5085 (diff)
parent41e46a97a43b0d5080bb9ace1b9326266955ef21 (diff)
Merge upstream branch
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'))