diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-06 13:58:37 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-06 13:58:37 +0100 |
| commit | 4c598360d646f734d254d45b397bc26984999f0a (patch) | |
| tree | 8fb31c27453edcde0214a6f553db9b207f49ce1c /system/libraries/Upload.php | |
| parent | 27984584d83784b39cf68e39200084ca2c8dc905 (diff) | |
| parent | 658e7b8e5d7953648f9cfe8cff082471cc292b68 (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) { |