summaryrefslogtreecommitdiffstats
path: root/system/core
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/core
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/core')
-rwxr-xr-xsystem/core/Output.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index 9b85b3ec4..a9e77cc5f 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -106,15 +106,13 @@ class CI_Output {
// Get mime types for later
if (defined('ENVIRONMENT') && file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
{
- include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
+ $this->mime_types = include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
}
else
{
- include APPPATH.'config/mimes.php';
+ $this->mime_types = include APPPATH.'config/mimes.php';
}
-
- $this->mime_types = $mimes;
log_message('debug', 'Output Class Initialized');
}