diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-09 13:35:06 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-09 13:35:06 +0100 |
| commit | 56c879a870600b3e3ffce586c849d53e85f93674 (patch) | |
| tree | 257ef7450d4f020d0db04e1481b59b89796434aa /system/libraries/Upload.php | |
| parent | d9170ad478690260f1b8dce17c82d4c7dc271902 (diff) | |
| parent | c016a1102e2a77e0c27b9656c19a0460df24dfb6 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/libraries/Upload.php')
| -rw-r--r-- | system/libraries/Upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index ac29c1bdd..89575c849 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -1101,7 +1101,7 @@ class CI_Upload { $proc = @popen($cmd, 'r'); if (is_resource($proc)) { - $mime = @fread($test, 512); + $mime = @fread($proc, 512); @pclose($proc); if ($mime !== FALSE) { |