1 files changed, 13 insertions, 1 deletions
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 02d4ce11e..43e12cf9e 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -147,9 +147,21 @@ if ( ! function_exists('force_download'))
 			@ob_clean();
 		}
 
+		$disposition = 'attachment; filename="'.$filename.'";';
+		$charset = config_item('charset');
+		if (strtoupper($charset) !== 'UTF-8')
+		{
+			// charset attribute (RFC 6266 only allows UTF-8)
+			$utf8_filename = get_instance()->utf8->convert_to_utf8($filename, $charset);
+			if ($utf8_filename !== FALSE)
+			{
+				$disposition .= ' filename*=UTF-8\'\''.rawurlencode($utf8_filename);
+			}
+		}
+
 		// Generate the server headers
 		header('Content-Type: '.$mime);
-		header('Content-Disposition: attachment; filename="'.$filename.'"');
+		header('Content-Disposition: '.$disposition);
 		header('Expires: 0');
 		header('Content-Transfer-Encoding: binary');
 		header('Content-Length: '.$filesize);