Fallback to UTF-8 if not valid mb_internal_encoding. Props tenpura. fixes #6092
git-svn-id: https://develop.svn.wordpress.org/trunk@7157 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
3185d6f736
commit
f9e7e6a590
|
@ -356,9 +356,7 @@ require (ABSPATH . WPINC . '/pluggable.php');
|
||||||
* since we want to use the mb_ functions for utf-8 strings
|
* since we want to use the mb_ functions for utf-8 strings
|
||||||
*/
|
*/
|
||||||
if (function_exists('mb_internal_encoding')) {
|
if (function_exists('mb_internal_encoding')) {
|
||||||
if (get_option('blog_charset'))
|
if (!@mb_internal_encoding(get_option('blog_charset')))
|
||||||
mb_internal_encoding(get_option('blog_charset'));
|
|
||||||
else
|
|
||||||
mb_internal_encoding('UTF-8');
|
mb_internal_encoding('UTF-8');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue