From 1845049665eeeb3ffdc13aa0a96c5631ef1062f2 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Thu, 12 Feb 2015 09:36:12 -0200 Subject: [PATCH] Revert "Add code to check if mb_convert_encoding function is exsited then can called it for emogrifier lib" --- includes/libraries/class-emogrifier.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/includes/libraries/class-emogrifier.php b/includes/libraries/class-emogrifier.php index 687dc10ec71..97ed1d34dd7 100644 --- a/includes/libraries/class-emogrifier.php +++ b/includes/libraries/class-emogrifier.php @@ -352,8 +352,7 @@ class Emogrifier { $this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument); if ($this->preserveEncoding) { - if ( function_exists('mb_convert_encoding') ) { return mb_convert_encoding($xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES'); } - else { return $xmlDocument->saveHTML(); } + return mb_convert_encoding($xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES'); } else { return $xmlDocument->saveHTML(); } @@ -537,8 +536,7 @@ class Emogrifier { $bodyWithoutUnprocessableTags = $this->html; } - if ( function_exists('mb_convert_encoding') ) { return mb_convert_encoding($bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING); } - else { return $bodyWithoutUnprocessableTags; } + return mb_convert_encoding($bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING); } /**