From 4a67fa3b0930462bb44bde99afcc681e95142e7d Mon Sep 17 00:00:00 2001 From: Peter Rotich <peter@osticket.com> Date: Wed, 5 Feb 2014 16:35:29 +0000 Subject: [PATCH] Encode the text even when target encoding is the same as charset This is needed to help us remove invalid characters set by some mail clients. --- include/class.format.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/class.format.php b/include/class.format.php index 5c188e497..8bdb7fa46 100644 --- a/include/class.format.php +++ b/include/class.format.php @@ -42,9 +42,6 @@ class Format { array('default','x-user-defined','iso','us-ascii'))) $charset = 'ISO-8859-1'; - if ($charset && strcasecmp($charset, $encoding) === 0) - return $text; - $original = $text; if(function_exists('iconv') && $charset) $text = iconv($charset, $encoding.'//IGNORE', $text); -- GitLab