From 924000e27e10eb32cff6b7666a9d41546fd5f2bd Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 22 Jul 2010 11:04:58 -0500
Subject: Fixed a bug in the Upload class where a PHP error could occur when
 wildcards were used as the allowed_types.

---
 system/libraries/Upload.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/libraries')

diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index c94e4d448..c18c178df 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -988,7 +988,7 @@ class CI_Upload {
 	 */
 	function _prep_filename($filename)
 	{
-		if (strpos($filename, '.') === FALSE)
+		if (strpos($filename, '.') === FALSE OR $this->allowed_types == '*')
 		{
 			return $filename;
 		}
@@ -1020,4 +1020,4 @@ class CI_Upload {
 // END Upload Class
 
 /* End of file Upload.php */
-/* Location: ./system/libraries/Upload.php */
\ No newline at end of file
+/* Location: ./system/libraries/Upload.php */
-- 
cgit v1.2.3-24-g4f1b