Changeset 18988

Timestamp:

10/18/2011 07:08:55 AM (13 years ago)

Author:

azaozz

Message:

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

File:

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

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

@@ -5 +5 @@
  * @package WordPress
  * @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.
@@ -366 +370 @@
 
             if ( $set['dfw'] ) {
-                function replace_fullscreen(&$val) {
-                    if ( $val == 'fullscreen' )
-                        $val = 'wp_fullscreen';
-                }
-
-                array_walk($mce_buttons, 'replace_fullscreen');
-                array_walk($mce_buttons_2, 'replace_fullscreen');
-                array_walk($mce_buttons_3, 'replace_fullscreen');
-                array_walk($mce_buttons_4, 'replace_fullscreen');
+                // replace the first 'fullscreen' with 'wp_fullscreen'
+                if ( ($key = array_search('fullscreen', $mce_buttons)) !== false )
+                    $mce_buttons[$key] = 'wp_fullscreen';
+                elseif ( ($key = array_search('fullscreen', $mce_buttons_2)) !== false )
+                    $mce_buttons_2[$key] = 'wp_fullscreen';
+                elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false )
+                    $mce_buttons_3[$key] = 'wp_fullscreen'; 
+                elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false )
+                    $mce_buttons_4[$key] = 'wp_fullscreen';
             }