diff options
author | Andrey Andreev <narf@devilix.net> | 2018-02-12 13:28:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-12 13:28:50 +0100 |
commit | 5a6e1989536f2bdc433128e8947ce72f9208830c (patch) | |
tree | 428ecb876d378bbc2693b72553a18d6b4478f77a /system | |
parent | 43538863b7bdd52529c38ad314ffc0f9edbbaa8b (diff) | |
parent | ff1029018a8e5ba7261cdfb71fb3d102c3efc22b (diff) |
[ci skip] Merge pull request #5403 from ytetsuro/fix/#5394/not-change-charset-bug
Fixed bug that download filename character code did not change
Diffstat (limited to 'system')
-rw-r--r-- | system/helpers/download_helper.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index b7a5336b6..a2e28a6e9 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -153,9 +153,7 @@ if ( ! function_exists('force_download')) $charset = strtoupper(config_item('charset')); if ($charset !== 'UTF-8') { - $utf8_filename = (UTF8_ENABLED === TRUE) - ? get_instance()->utf8->convert_to_utf8($filename, $charset) - : FALSE; + $utf8_filename = get_instance()->utf8->convert_to_utf8($filename, $charset); } else { |