diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2008-05-14 23:26:35 +0200 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2008-05-14 23:26:35 +0200 |
| commit | d9d379c1b4d674ed16edaf8167cc8f5f65becc86 (patch) | |
| tree | 2b187d2220385ee19792bc956647f566cc5b0b33 | |
| parent | b846d38da5deff9dac602a9d7dbb8e88ce14a73c (diff) | |
Set the mime type check in the Upload class to reference the global mimes variable.
| -rw-r--r-- | system/libraries/Upload.php | 4 | ||||
| -rw-r--r-- | user_guide/changelog.html | 5 |
2 files changed, 8 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);
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8217cbff4..28eb39d3b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -66,6 +66,11 @@ SVN Revision: not currently released</p> <li>Added ability to set additional database config values in <a href="database/connecting.html">DSN connections</a> via the query string.</li>
</ul>
</li>
+ <li>Libraries
+ <ul>
+ <li>Set the mime type check in the <a href="libraries/file_uploading.html">Upload class</a> to reference the global mimes variable.</li>
+ </ul>
+ </li>
</ul>
|