diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-05 12:43:25 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-05 12:43:25 +0100 |
| commit | 193ec9693b642cf53a8ff7c2679f6a3c433abbb8 (patch) | |
| tree | 6c9519bf9207dcbbd18e336a1a5dfb5252339220 /system/libraries/Upload.php | |
| parent | 8741dda98f2cf4be982ce0cb4f6f798d2b53c0a9 (diff) | |
| parent | 2baae203864cecd6f7c92b244c28dd18e0051d2c (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-issue-499
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) { |