diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-23 12:25:52 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-23 12:25:52 +0100 |
| commit | b8188f6a588fbf2a4b9570580999317ba149ecb0 (patch) | |
| tree | 0205671d3f53c6253ecbbb676ccf6c3044597889 /system | |
| parent | 0199f68db46d375af2d4cb831c679d3040601f25 (diff) | |
| parent | 8ed78098369cd445bae796d0cd31b34cbc02585a (diff) | |
Merge pull request #697 from MVUG/upload-fixes-2.1
Fixed bug in Upload library
tmp_path does not exists, should be tmp_name.
Diffstat (limited to 'system')
| -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 05511b5d3..fe5907ab2 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -1055,7 +1055,7 @@ class CI_Upload { if (DIRECTORY_SEPARATOR !== '\\' && function_exists('exec')) { $output = array(); - @exec('file --brief --mime-type ' . escapeshellarg($file['tmp_path']), $output, $return_code); + @exec('file --brief --mime-type ' . escapeshellarg($file['tmp_name']), $output, $return_code); if ($return_code === 0 && strlen($output[0]) > 0) // A return status code != 0 would mean failed execution { $this->file_type = rtrim($output[0]); |