golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add some more documentation and prevent fatal error if a plugin tries to use 'dfw' second time, see #17144 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18988 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-10-18 07:08:55 +00:00
parent 0c9a60c4e7
commit 2d2e825359
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,10 @@
* @package WordPress * @package WordPress
* @since 3.3 * @since 3.3
* *
* NOTE: Do not instantiate this class directly. Please use the wp_editor() function that will include the file
* and instantiate the class if needed. If you want to extend this class use the 'init' or earlier action to do it
* and call wp_editor() as usual when you need to output the HTML.
*
* Outputs the HTML and JavaScript for the WordPress editors, TinyMCE and Quicktags. * Outputs the HTML and JavaScript for the WordPress editors, TinyMCE and Quicktags.
* TinyMCE is loaded separately from other Javascript by using wp-tinymce.php. It outputs concatenated * TinyMCE is loaded separately from other Javascript by using wp-tinymce.php. It outputs concatenated
* pre-compressed version of the core and all default plugins. Additional plugins are loaded directly * pre-compressed version of the core and all default plugins. Additional plugins are loaded directly
@ -365,15 +369,15 @@ class WP_Editor {
} }
if ( $set['dfw'] ) { if ( $set['dfw'] ) {
function replace_fullscreen(&$val) { // replace the first 'fullscreen' with 'wp_fullscreen'
if ( $val == 'fullscreen' ) if ( ($key = array_search('fullscreen', $mce_buttons)) !== false )
$val = 'wp_fullscreen'; $mce_buttons[$key] = 'wp_fullscreen';
} elseif ( ($key = array_search('fullscreen', $mce_buttons_2)) !== false )
$mce_buttons_2[$key] = 'wp_fullscreen';
array_walk($mce_buttons, 'replace_fullscreen'); elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false )
array_walk($mce_buttons_2, 'replace_fullscreen'); $mce_buttons_3[$key] = 'wp_fullscreen';
array_walk($mce_buttons_3, 'replace_fullscreen'); elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false )
array_walk($mce_buttons_4, 'replace_fullscreen'); $mce_buttons_4[$key] = 'wp_fullscreen';
} }
$mceInit = array ( $mceInit = array (