diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-05 15:17:32 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-05 15:17:32 +0100 |
| commit | 99013ed3ed0ea5641a6c6b6afa08a7befb579cb0 (patch) | |
| tree | ec85d2c3b418d87366d88f9efc96c03bfa839fdb /system/libraries/Upload.php | |
| parent | 62d6ee48b319dc7ec92b4a14fa8dbd3601060544 (diff) | |
| parent | 57bdeb61bf199d1ae3ceaede4e9a9af8290ce715 (diff) | |
Rename property _commit to commit_mode and merge upstream changes
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) { |