diff options
Diffstat (limited to 'system/libraries/Upload.php')
| -rw-r--r-- | system/libraries/Upload.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 92bf6912b..6309caee3 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -187,7 +187,7 @@ class CI_Upload { // Set the uploaded data as class variables $this->file_temp = $_FILES[$field]['tmp_name']; - $this->file_name = ($this->file_name != '') ? $this->_prep_filename($this->file_name) : $this->_prep_filename($_FILES[$field]['name']); + $this->file_name = $this->_prep_filename($_FILES[$field]['name']; $this->file_size = $_FILES[$field]['size']; $this->file_type = preg_replace("/^(.+?);.*$/", "\\1", $_FILES[$field]['type']); $this->file_type = strtolower($this->file_type); @@ -927,7 +927,13 @@ class CI_Upload { $filename .= '.'.$part; } } - + + // file name override + if ($this->file_name != '') + { + $filename = $this->file_name; + } + $filename .= '.'.$ext; return $filename; |