[ci skip] More polish on the download helper

1 files changed, 3 insertions, 10 deletions

diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index a2e28a6e9..000e4c707 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -149,17 +149,10 @@ if ( ! function_exists('force_download'))
 
 		// RFC 6266 allows for multibyte filenames, but only in UTF-8,
 		// so we have to make it conditional ...
-		$utf8_filename = $filename;
 		$charset = strtoupper(config_item('charset'));
-		if ($charset !== 'UTF-8')
-		{
-			$utf8_filename = get_instance()->utf8->convert_to_utf8($filename, $charset);
-		}
-		else
-		{
-			$utf8_filename = $filename;
-		}
-
+		$utf8_filename = ($charset !== 'UTF-8')
+			? $utf8_filename = get_instance()->utf8->convert_to_utf8($filename, $charset)
+			: $filename;
 		isset($utf8_filename[0]) && $utf8_filename = " filename*=UTF-8''".rawurlencode($utf8_filename);
 
 		// Generate the server headers