summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-06-04 23:51:14 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-06-04 23:51:14 +0200
commit39b1c11f5976104dce30fe83e1d3c6f9ed616122 (patch)
tree482b07468ca201d0dbdbfcf3cdb121c967003112 /system/helpers
parent10d78f61399dd647ada0afaa43e5e9ec48d55e82 (diff)
Direct return from mimes config, instead of using global $mimes;
Global variables are generally a terrible idea, especially for something as simple as this. The mimes.php now returns an array instead of just injecting a variable name into the global namespace.
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/download_helper.php4
-rw-r--r--system/helpers/file_helper.php6
2 files changed, 5 insertions, 5 deletions
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 9c390a7f7..3c677055f 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -75,11 +75,11 @@ 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');
+ $mimes = include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
}
elseif (is_file(APPPATH.'config/mimes.php'))
{
- include(APPPATH.'config/mimes.php');
+ $mimes = include(APPPATH.'config/mimes.php');
}
// Only change the default MIME if we can find one
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index 0061c4285..068706c30 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -349,17 +349,17 @@ if ( ! function_exists('get_mime_by_extension'))
{
$extension = strtolower(substr(strrchr($file, '.'), 1));
- global $mimes;
+ static $mimes;
if ( ! is_array($mimes))
{
if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
{
- include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
+ $mimes = include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
}
elseif (is_file(APPPATH.'config/mimes.php'))
{
- include(APPPATH.'config/mimes.php');
+ $mimes = include(APPPATH.'config/mimes.php');
}
if ( ! is_array($mimes))