WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some of the TinyMCE 4.1.10 fixes to 4.2. 

See [32366], 32262.
Built from https://develop.svn.wordpress.org/branches/4.2@32369


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32339 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-05-06 05:12:29 +00:00
parent db8f915ee6
commit 568c4e8f56
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/tinymce/tiny_mce_popup.js vendored
View File

@ -359,7 +359,7 @@ var tinyMCEPopup = {
"browse": "Browse"
};
var langCode = tinymce.settings.language || 'en';
var langCode = (tinymce.settings ? tinymce.settings : t.editor.settings).language || 'en';
for (var key in map) {
tinymce.i18n.data[langCode + "." + key] = tinymce.i18n.translate(map[key]);
}

25
wp-includes/js/tinymce/tinymce.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -18,7 +18,7 @@ $wp_db_version = 31534;
*
* @global string $tinymce_version
*/
$tinymce_version = '4109-20150406';
$tinymce_version = '4109-20150505';
/**
* Holds the required PHP version