WordPress.org

Make WordPress Core

Changeset 12954


Ignore:
Timestamp:
02/04/2010 08:00:18 PM (11 years ago)
Author:
ryan
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/post.php

    r12944 r12954  
    14081408        $mce_buttons = implode($mce_buttons, ',');
    14091409
    1410         $mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ));
     1410        $mce_buttons_2 = array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' );
     1411        if ( is_multisite() )
     1412            unset( $mce_buttons_2[ array_search( 'media', $mce_buttons_2 ) ] );
     1413        $mce_buttons_2 = apply_filters('mce_buttons_2', $mce_buttons_2);
    14111414        $mce_buttons_2 = implode($mce_buttons_2, ',');
    14121415
  • trunk/wp-includes/ms-default-filters.php

    r12948 r12954  
    2020
    2121// Administration
    22 add_filter ( 'mce_buttons_2', 'remove_tinymce_media_button' );
    2322add_filter ( 'term_id_filter', 'global_terms', 10, 2 );
    2423add_action ( 'publish_post', 'update_posts_count' );
  • trunk/wp-includes/ms-functions.php

    r12953 r12954  
    17591759}
    17601760
    1761 function remove_tinymce_media_button( $buttons ) {
    1762     unset( $buttons[ array_search( 'media', $buttons ) ] );
    1763     return $buttons;
    1764 }
    1765 
    17661761function maybe_add_existing_user_to_blog() {
    17671762    if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
     
    18241819}
    18251820add_action('update_option_blog_public', 'update_blog_public', 10, 2);
    1826    
     1821
    18271822/* Redirect all hits to "dashboard" blog to wp-admin/ Dashboard. */
    18281823function redirect_mu_dashboard() {
Note: See TracChangeset for help on using the changeset viewer.