diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-06-12 13:45:45 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-06-12 13:45:45 +0200 |
| commit | b30a7c0d53c5dae5dab2311f777d67f639a5cee4 (patch) | |
| tree | d518bc938a5d8458a55277d9adaa7d8fdcc9f1d3 /system/helpers/download_helper.php | |
| parent | 3902e383b41c6c0ef77b65e95d451cb2ea3d85db (diff) | |
| parent | 4e9538fe19b09c0dc588542cfb7f793348b83bf7 (diff) | |
Merge upstream
Diffstat (limited to 'system/helpers/download_helper.php')
| -rw-r--r-- | system/helpers/download_helper.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index 9c390a7f7..5efbc4930 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -73,14 +73,7 @@ if ( ! function_exists('force_download')) } // Load the mime types - if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php')) - { - include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'); - } - elseif (is_file(APPPATH.'config/mimes.php')) - { - include(APPPATH.'config/mimes.php'); - } + $mimes =& get_mimes(); // Only change the default MIME if we can find one if (isset($mimes[$extension])) |