IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kill the multisite mu_media_buttons option. see #17578.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin
2011-10-05 22:04:09 +00:00
parent 337699e1cf
commit 5d33f15fb3
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/edit-form-advanced.php
View File

@@ -121,8 +121,7 @@ foreach ( get_object_taxonomies($post_type) as $tax_name ) {
if ( post_type_supports($post_type, 'page-attributes') )
add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', $post_type, 'side', 'core');
if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' )
&& ( ! is_multisite() || ( ( $mu_media_buttons = get_site_option( 'mu_media_buttons', array() ) ) && ! empty( $mu_media_buttons['image'] ) ) ) )
if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ) )
add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', $post_type, 'side', 'low');
if ( post_type_supports($post_type, 'excerpt') )