diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-05 13:23:57 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-05 13:23:57 +0100 |
| commit | 74496c268ae7199082cad86e0fea65687d78a2c9 (patch) | |
| tree | 7a02e9961dda1e6949c4cbd986c894ffb9ed15a3 /system/libraries/Upload.php | |
| parent | bb5dae46256cdcb0bcd204b6fa2fc628da6afb88 (diff) | |
| parent | cc5af53346397846f2035dc2bf6a2c2f9b0cd4ab (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) { |