diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-04 14:22:29 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-04 14:22:29 +0100 |
| commit | 4383e36dd8af32ce3a8d8584bad78f62e8465726 (patch) | |
| tree | 03e3ef0375a4831dd63e657866e582271a0a326c /system/libraries | |
| parent | 1887c6d4847fd9d4251b58aba599cb8ee63d2e38 (diff) | |
| parent | 69dcfbc0f45097e5471858e2ef8d6c92096bc1e7 (diff) | |
Merge pull request #1117 from tubalmartin/Upload|library|2.1-stable
2.1 stable - CI_Upload::_file_mime_type() could've failed if popen() is used for the detection.
Diffstat (limited to 'system/libraries')
| -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 91fbf66ca..b0490de30 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -1095,7 +1095,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) { |