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

Stop WP_Editor from outputting TinyMCE external plugins/languages multiple times. Props Cyapow. Fixes #19648. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19913 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
duck_ 2012-02-13 18:05:04 +00:00
parent 6b6156b5f4
commit f906c35510
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp-editor.php
View File

@ -167,10 +167,10 @@ final class _WP_Editors {
$no_captions = (bool) apply_filters( 'disable_captions', '' );
$plugins = array( 'inlinepopups', 'spellchecker', 'tabfocus', 'paste', 'media', 'fullscreen', 'wordpress', 'wpeditimage', 'wpgallery', 'wplink', 'wpdialogs' );
$first_run = true;
$ext_plugins = '';
if ( $set['teeny'] ) {
self::$plugins = $plugins = apply_filters( 'teeny_mce_plugins', array('inlinepopups', 'fullscreen', 'wordpress', 'wplink', 'wpdialogs'), $editor_id );
$ext_plugins = '';
} else {
/*
The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'.
@ -181,7 +181,6 @@ final class _WP_Editors {
*/
$mce_external_plugins = apply_filters('mce_external_plugins', array());
$ext_plugins = '';
if ( ! empty($mce_external_plugins) ) {
/*
@ -247,8 +246,6 @@ final class _WP_Editors {
$ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
$ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
self::$ext_plugins .= $ext_plugins;
}
}
@ -259,6 +256,7 @@ final class _WP_Editors {
$plugins[] = 'wpfullscreen';
self::$plugins = $plugins;
self::$ext_plugins = $ext_plugins;
/*
translators: These languages show up in the spellchecker drop-down menu, in the order specified, and with the first