TinyMCE: fix the compat3x plugin appending 'en.' to button titles. Set charset to UTF-8 in html_entity_decode() for translated strings. See #24067, see #26875.

Built from https://develop.svn.wordpress.org/trunk@27030


git-svn-id: http://core.svn.wordpress.org/trunk@26906 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz
2014-01-25 01:21:13 +00:00
parent eb1d21d782
commit ed3145ec3d
5 changed files with 10 additions and 5 deletions

View File

@@ -691,7 +691,7 @@ final class _WP_Editors {
foreach ( $mce_translation as $key => $value ) {
if ( strpos( $value, '&' ) !== false )
$mce_translation[$key] = html_entity_decode( $value, ENT_QUOTES );
$mce_translation[$key] = html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
}
return "tinymce.addI18n( '$mce_locale', " . json_encode( $mce_translation ) . ");\n" .