summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorMichiel Vugteveen <michiel@it-can.nl>2012-06-11 10:37:52 +0200
committerMichiel Vugteveen <michiel@it-can.nl>2012-06-11 10:37:52 +0200
commit46a0429a02bdf9dcf63c44c3f344417a1e9a5f0f (patch)
tree3e90807c2b4381ef7364d1a7e9e8b533d4033893 /system
parent3a7fb04fec6d5a389b8ab40b32403c9db0c40389 (diff)
fixes
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Upload.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 287e28106..b1d6ad6ca 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -369,12 +369,12 @@ class CI_Upload {
'image_size_str' => $this->image_size_str,
);
- if ($index === NULL OR ! isset($data[$index]))
+ if ( ! empty($index))
{
- return $data;
+ return isset($data[$index]) ? $data[$index] : NULL;
}
- return $data[$index];
+ return $data;
}
// --------------------------------------------------------------------