From d9d379c1b4d674ed16edaf8167cc8f5f65becc86 Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Wed, 14 May 2008 21:26:35 +0000
Subject: Set the mime type check in the Upload class to reference the global
 mimes variable.

---
 system/libraries/Upload.php | 4 +++-
 user_guide/changelog.html   | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

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>
 
 
-- 
cgit v1.2.3-24-g4f1b