Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7387 from woothemes/revert-7379-master 

Revert "Add code to check if mb_convert_encoding function is exsited the...
This commit is contained in:
Claudio Sanches 2015-02-12 09:36:18 -02:00
parent 16e14914d8 1845049665
commit a17bd25c96
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/libraries/class-emogrifier.php
View File

@ -352,8 +352,7 @@ class Emogrifier {
$this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument); $this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
if ($this->preserveEncoding) { if ($this->preserveEncoding) {
if ( function_exists('mb_convert_encoding') ) { return mb_convert_encoding($xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES'); } return mb_convert_encoding($xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES');
else { return $xmlDocument->saveHTML(); }
} else { } else {
return $xmlDocument->saveHTML(); return $xmlDocument->saveHTML();
} }
@ -537,8 +536,7 @@ class Emogrifier {
$bodyWithoutUnprocessableTags = $this->html; $bodyWithoutUnprocessableTags = $this->html;
} }
if ( function_exists('mb_convert_encoding') ) { return mb_convert_encoding($bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING); } return mb_convert_encoding($bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING);
else { return $bodyWithoutUnprocessableTags; }
} }
/** /**