WordPress.org

Make WordPress Core

Changeset 18892


Ignore:
Timestamp:
10/05/11 22:04:09 (3 years ago)
Author:
nacin
Message:

Kill the multisite mu_media_buttons option. see #17578.

Location:
trunk/wp-admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/edit-form-advanced.php

    r18889 r18892  
    122122    add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', $post_type, 'side', 'core'); 
    123123 
    124 if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ) 
    125     && ( ! is_multisite() || ( ( $mu_media_buttons = get_site_option( 'mu_media_buttons', array() ) ) && ! empty( $mu_media_buttons['image'] ) ) ) ) 
     124if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ) ) 
    126125        add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', $post_type, 'side', 'low'); 
    127126 
  • trunk/wp-admin/network/settings.php

    r18842 r18892  
    8181    } 
    8282 
    83     $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'mu_media_buttons', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled' ); 
    84     $checked_options = array( 'mu_media_buttons' => array(), 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 ); 
     83    $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'upload_disabled', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled' ); 
     84    $checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 ); 
    8585    foreach ( $checked_options as $option_name => $option_unchecked_value ) { 
    8686        if ( ! isset( $_POST[$option_name] ) ) 
     
    271271        <table class="form-table"> 
    272272            <tr valign="top"> 
    273                 <th scope="row"><?php _e( 'Media upload buttons' ) ?></th> 
    274                 <?php $mu_media_buttons = get_site_option( 'mu_media_buttons', array() ); ?> 
    275                 <td><label><input type="checkbox" id="mu_media_buttons_image" name="mu_media_buttons[image]" value="1"<?php checked( ! empty( $mu_media_buttons['image'] ) ) ?>/> <?php _e( 'Images' ); ?></label><br /> 
    276                 <label><input type="checkbox" id="mu_media_buttons_video" name="mu_media_buttons[video]" value="1"<?php checked( ! empty( $mu_media_buttons['video'] ) ) ?>/> <?php _e( 'Videos' ); ?></label><br /> 
    277                 <label><input type="checkbox" id="mu_media_buttons_audio" name="mu_media_buttons[audio]" value="1"<?php checked( ! empty( $mu_media_buttons['audio'] ) ) ?>/> <?php _e( 'Music' ); ?></label><br /> 
    278                 <?php _e( 'The media upload buttons to display on the &#8220;Write Post&#8221; page. Make sure you update the allowed upload file types below as well.' ); ?></td> 
    279             </tr> 
    280  
    281             <tr valign="top"> 
    282273                <th scope="row"><?php _e( 'Site upload space' ) ?></th> 
    283274                <td> 
Note: See TracChangeset for help on using the changeset viewer.