summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-01-06 21:04:12 +0100
committerDerek Allard <derek.allard@ellislab.com>2008-01-06 21:04:12 +0100
commitfd5c01a1c14f396bb63b3e2dce7dab2548a1cefa (patch)
tree85e6af392fedd039392081f0dc222d8122a5e812
parenta070db9c481346b4f9884bd32c3d1445a795f7a8 (diff)
Fixed a bug in the upload library when allowed_files wasn't defined.
-rw-r--r--system/libraries/Upload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index f804dcec8..33ee94773 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -512,7 +512,7 @@ class CI_Upload {
*/
function is_allowed_filetype()
{
- if (count($this->allowed_types) == 0)
+ if (count($this->allowed_types) == 0 || ! is_array($this->allowed_types))
{
$this->set_error('upload_no_file_types');
return FALSE;