summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-05-14 23:26:35 +0200
committerDerek Allard <derek.allard@ellislab.com>2008-05-14 23:26:35 +0200
commitd9d379c1b4d674ed16edaf8167cc8f5f65becc86 (patch)
tree2b187d2220385ee19792bc956647f566cc5b0b33 /system
parentb846d38da5deff9dac602a9d7dbb8e88ce14a73c (diff)
Set the mime type check in the Upload class to reference the global mimes variable.
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Upload.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 1225ee36b..23e52e403 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -821,9 +821,11 @@ class CI_Upload {
*/
function mimes_types($mime)
{
+ global $mimes;
+
if (count($this->mimes) == 0)
{
- if (@include(APPPATH.'config/mimes'.EXT))
+ if (@require_once(APPPATH.'config/mimes'.EXT))
{
$this->mimes = $mimes;
unset($mimes);