Changeset 19913

Timestamp:

02/13/2012 06:05:04 PM (13 years ago)

Author:

duck_

Message:

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

File:

• trunk/wp-includes/class-wp-editor.php (modified) (4 diffs)

trunk/wp-includes/class-wp-editor.php

@@ -168 +168 @@
                 $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 {
                     /*
@@ -182 +182 @@
                     $mce_external_plugins = apply_filters('mce_external_plugins', array());
 
-                    $ext_plugins = '';
                     if ( ! empty($mce_external_plugins) ) {
 
@@ -248 +247 @@
                             $ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
                             $ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
-
-                            self::$ext_plugins .= $ext_plugins;
                         }
                     }
@@ -260 +257 @@
 
                 self::$plugins = $plugins;
+                self::$ext_plugins = $ext_plugins;
 
                 /*