Changeset 12954

Timestamp:

02/04/2010 08:00:18 PM (16 years ago)

Author:

ryan

Message:

Integrate remove_tinymce_media_button() into wp_tiny_mce(). see #11644

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/ms-default-filters.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (2 diffs)

trunk/wp-admin/includes/post.php

@@ -1408 +1408 @@
         $mce_buttons = implode($mce_buttons, ',');
 
-        $mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ));
+        $mce_buttons_2 = array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' );
+        if ( is_multisite() )
+            unset( $mce_buttons_2[ array_search( 'media', $mce_buttons_2 ) ] );
+        $mce_buttons_2 = apply_filters('mce_buttons_2', $mce_buttons_2);
         $mce_buttons_2 = implode($mce_buttons_2, ',');
 

trunk/wp-includes/ms-default-filters.php

@@ -20 +20 @@
 
 // Administration
-add_filter ( 'mce_buttons_2', 'remove_tinymce_media_button' );
 add_filter ( 'term_id_filter', 'global_terms', 10, 2 );
 add_action ( 'publish_post', 'update_posts_count' );

trunk/wp-includes/ms-functions.php

@@ -1759 +1759 @@
 }
 
-function remove_tinymce_media_button( $buttons ) {
-    unset( $buttons[ array_search( 'media', $buttons ) ] );
-    return $buttons;
-}
-
 function maybe_add_existing_user_to_blog() {
     if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
@@ -1824 +1819 @@
 }
 add_action('update_option_blog_public', 'update_blog_public', 10, 2);
-    
+
 /* Redirect all hits to "dashboard" blog to wp-admin/ Dashboard. */
 function redirect_mu_dashboard() {