diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-02-09 22:35:08 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-02-09 22:35:08 +0100 |
| commit | 477e08f1d6726809660e4841f389493541f7bc07 (patch) | |
| tree | 785b12b53c5e46e317def1768558f33445ab2b1f /system/libraries/Upload.php | |
| parent | 2342256c076502cbaca86fcff2a1dbbfc49a1900 (diff) | |
| parent | 39967987ebcc79fc867c1f7fa8d69cc65801f594 (diff) | |
Merge branch '3.0-stable' into develop
Fixed conflicts:
user_guide_src/source/overview/at_a_glance.rst
Diffstat (limited to 'system/libraries/Upload.php')
| -rw-r--r-- | system/libraries/Upload.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 15caebebe..f2418378b 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -526,6 +526,12 @@ class CI_Upload { $this->file_name = preg_replace('/\s+/', '_', $this->file_name); } + if ($this->file_ext_tolower && ($ext_length = strlen($this->file_ext))) + { + // file_ext was previously lower-cased by a get_extension() call + $this->file_name = substr($this->file_name, 0, -$ext_length).$this->file_ext; + } + /* * Validate the file name * This function appends an number onto the end of |