Index: wp-admin/includes/media.php =================================================================== --- wp-admin/includes/media.php (revision 18821) +++ wp-admin/includes/media.php (working copy) @@ -374,22 +374,8 @@ * @since 2.5.0 */ function media_buttons($editor_id = 'content') { - $out = ''; + $out = _media_button(__('Add Media'), 'images/media-button-video.gif?ver=20100531', 'media', $editor_id); - if ( is_multisite() ) - $_buttons = get_site_option('mu_media_buttons'); - else - $_buttons = array( 'image' => true, 'video' => true, 'audio' => true ); - - if ( !empty($_buttons['image']) ) - $out .= _media_button(__('Add an Image'), 'images/media-button-image.gif?ver=20100531', 'image', $editor_id); - if ( !empty($_buttons['video']) ) - $out .= _media_button(__('Add Video'), 'images/media-button-video.gif?ver=20100531', 'video', $editor_id); - if ( !empty($_buttons['audio']) ) - $out .= _media_button(__('Add Audio'), 'images/media-button-music.gif?ver=20100531', 'audio', $editor_id); - - $out .= _media_button(__('Add Media'), 'images/media-button-other.gif?ver=20100531', 'media', $editor_id); - $context = apply_filters('media_buttons_context', __('Upload/Insert %s')); printf($context, $out); @@ -527,20 +513,37 @@ } if ( !empty($_POST['insertonlybutton']) ) { - $alt = $align = ''; - $src = $_POST['insertonly']['src']; if ( !empty($src) && !strpos($src, '://') ) $src = "http://$src"; - $alt = esc_attr($_POST['insertonly']['alt']); - if ( isset($_POST['insertonly']['align']) ) { - $align = esc_attr($_POST['insertonly']['align']); - $class = " class='align$align'"; + + if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) { + $title = esc_attr($_POST['insertonly']['title']); + if ( empty($title) ) + $title = esc_attr( basename($src) ); + + if ( !empty($title) && !empty($src) ) + $html = "$title"; + + $type = 'file'; + if ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) && $ext_type = wp_ext2type( $ext ) + && ( 'audio' == $ext_type || 'video' == $ext_type ) ) + $type = $ext_type; + + $html = apply_filters( $type . '_send_to_editor_url', $html, esc_url_raw( $src ), $title ); + } else { + $align = ''; + $alt = esc_attr($_POST['insertonly']['alt']); + if ( isset($_POST['insertonly']['align']) ) { + $align = esc_attr($_POST['insertonly']['align']); + $class = " class='align$align'"; + } + if ( !empty($src) ) + $html = "$alt"; + + $html = apply_filters( 'image_send_to_editor_url', $html, esc_url_raw( $src ), $alt, $align ); } - if ( !empty($src) ) - $html = "$alt"; - $html = apply_filters('image_send_to_editor_url', $html, esc_url_raw($src), $alt, $align); return media_send_to_editor($html); } @@ -558,8 +561,12 @@ return media_upload_gallery(); } - if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) - return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id ); + if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) { + $type = 'image'; + if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) + $type = $_GET['type']; + return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id ); + } return wp_iframe( 'media_upload_type_form', 'image', $errors, $id ); } @@ -617,180 +624,6 @@ * * @return unknown */ -function media_upload_audio() { - $errors = array(); - $id = 0; - - if ( isset($_POST['html-upload']) && !empty($_FILES) ) { - check_admin_referer('media-form'); - // Upload File button was clicked - $id = media_handle_upload('async-upload', $_REQUEST['post_id']); - unset($_FILES); - if ( is_wp_error($id) ) { - $errors['upload_error'] = $id; - $id = false; - } - } - - if ( !empty($_POST['insertonlybutton']) ) { - $href = $_POST['insertonly']['href']; - if ( !empty($href) && !strpos($href, '://') ) - $href = "http://$href"; - - $title = esc_attr($_POST['insertonly']['title']); - if ( empty($title) ) - $title = esc_attr( basename($href) ); - - if ( !empty($title) && !empty($href) ) - $html = "$title"; - - $html = apply_filters('audio_send_to_editor_url', $html, $href, $title); - - return media_send_to_editor($html); - } - - if ( !empty($_POST) ) { - $return = media_upload_form_handler(); - - if ( is_string($return) ) - return $return; - if ( is_array($return) ) - $errors = $return; - } - - if ( isset($_POST['save']) ) { - $errors['upload_notice'] = __('Saved.'); - return media_upload_gallery(); - } - - if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) - return wp_iframe( 'media_upload_type_url_form', 'audio', $errors, $id ); - - return wp_iframe( 'media_upload_type_form', 'audio', $errors, $id ); -} - -/** - * {@internal Missing Short Description}} - * - * @since 2.5.0 - * - * @return unknown - */ -function media_upload_video() { - $errors = array(); - $id = 0; - - if ( isset($_POST['html-upload']) && !empty($_FILES) ) { - check_admin_referer('media-form'); - // Upload File button was clicked - $id = media_handle_upload('async-upload', $_REQUEST['post_id']); - unset($_FILES); - if ( is_wp_error($id) ) { - $errors['upload_error'] = $id; - $id = false; - } - } - - if ( !empty($_POST['insertonlybutton']) ) { - $href = $_POST['insertonly']['href']; - if ( !empty($href) && !strpos($href, '://') ) - $href = "http://$href"; - - $title = esc_attr($_POST['insertonly']['title']); - if ( empty($title) ) - $title = esc_attr( basename($href) ); - - if ( !empty($title) && !empty($href) ) - $html = "$title"; - - $html = apply_filters('video_send_to_editor_url', $html, $href, $title); - - return media_send_to_editor($html); - } - - if ( !empty($_POST) ) { - $return = media_upload_form_handler(); - - if ( is_string($return) ) - return $return; - if ( is_array($return) ) - $errors = $return; - } - - if ( isset($_POST['save']) ) { - $errors['upload_notice'] = __('Saved.'); - return media_upload_gallery(); - } - - if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) - return wp_iframe( 'media_upload_type_url_form', 'video', $errors, $id ); - - return wp_iframe( 'media_upload_type_form', 'video', $errors, $id ); -} - -/** - * {@internal Missing Short Description}} - * - * @since 2.5.0 - * - * @return unknown - */ -function media_upload_file() { - $errors = array(); - $id = 0; - - if ( isset($_POST['html-upload']) && !empty($_FILES) ) { - check_admin_referer('media-form'); - // Upload File button was clicked - $id = media_handle_upload('async-upload', $_REQUEST['post_id']); - unset($_FILES); - if ( is_wp_error($id) ) { - $errors['upload_error'] = $id; - $id = false; - } - } - - if ( !empty($_POST['insertonlybutton']) ) { - $href = $_POST['insertonly']['href']; - if ( !empty($href) && !strpos($href, '://') ) - $href = "http://$href"; - - $title = esc_attr($_POST['insertonly']['title']); - if ( empty($title) ) - $title = basename($href); - if ( !empty($title) && !empty($href) ) - $html = "$title"; - $html = apply_filters('file_send_to_editor_url', $html, esc_url_raw($href), $title); - return media_send_to_editor($html); - } - - if ( !empty($_POST) ) { - $return = media_upload_form_handler(); - - if ( is_string($return) ) - return $return; - if ( is_array($return) ) - $errors = $return; - } - - if ( isset($_POST['save']) ) { - $errors['upload_notice'] = __('Saved.'); - return media_upload_gallery(); - } - - if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) - return wp_iframe( 'media_upload_type_url_form', 'file', $errors, $id ); - - return wp_iframe( 'media_upload_type_form', 'file', $errors, $id ); -} - -/** - * {@internal Missing Short Description}} - * - * @since 2.5.0 - * - * @return unknown - */ function media_upload_gallery() { $errors = array(); @@ -1605,23 +1438,22 @@ * @param unknown_type $errors * @param unknown_type $id */ -function media_upload_type_url_form($type = 'file', $errors = null, $id = null) { +function media_upload_type_url_form($type = null, $errors = null, $id = null) { + if ( null === $type ) + $type = 'image'; + media_upload_header(); $post_id = intval($_REQUEST['post_id']); $form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id"); $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type); - - $callback = "type_url_form_$type"; ?>
- -

- +
+ @@ -2043,12 +1880,20 @@ if ( empty($default_align) ) $default_align = 'none'; + if ( 'image' == $default_view ) { + $view = 'image-only'; + $table_class = ''; + } else { + $view = $table_class = 'not-image'; + } + return ' -

' . __('Insert an image from another web site') . '

- +

' . __('Insert media from another web site') . '

+

   

+
@@ -2056,13 +1901,15 @@ - + + + @@ -2070,7 +1917,7 @@

' . __('Alt text for the image, e.g. “The Mona Lisa”') . '

' . $caption . ' - + - + @@ -2094,103 +1941,23 @@

' . __('Enter a link URL or click above for presets.') . '

- ' . _insert_into_post_button('image') . ' -
- + *
- + *

' . __('Link text, e.g. “Ransom Demands (PDF)”') . '

 @@ -2084,7 +1931,7 @@
-'; - -} - -/** - * {@internal Missing Short Description}} - * - * @since 2.7.0 - * - * @return unknown - */ -function type_url_form_audio() { - return ' - - - - + + + - - - + + + - - ' . _insert_into_post_button('audio') . '
- - * -
+ +
- - * -
+ ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . ' +
' . __('Link text, e.g. “Still Alive by Jonathan Coulton”') . '
'; -} -/** - * {@internal Missing Short Description}} - * - * @since 2.7.0 - * - * @return unknown - */ -function type_url_form_video() { - return ' - - - - - - - - - - - ' . _insert_into_post_button('video') . ' -
- - * -
- - * -
' . __('Link text, e.g. “Lucy on YouTube”') . '
-'; } -/** - * {@internal Missing Short Description}} - * - * @since 2.7.0 - * - * @return unknown - */ -function type_url_form_file() { - return ' - - - - - - - - - - - ' . _insert_into_post_button('file') . ' -
- - * -
- - * -
' . __('Link text, e.g. “Ransom Demands (PDF)”') . '
-'; -} - - function _insert_into_post_button($type) { if ( !post_type_supports(get_post_type($_GET['post_id']), 'editor') ) return ''; @@ -2238,9 +2005,9 @@ add_filter('async_upload_file', 'get_media_item', 10, 2); add_action('media_upload_image', 'media_upload_image'); -add_action('media_upload_audio', 'media_upload_audio'); -add_action('media_upload_video', 'media_upload_video'); -add_action('media_upload_file', 'media_upload_file'); +add_action('media_upload_audio', 'media_upload_image'); +add_action('media_upload_video', 'media_upload_image'); +add_action('media_upload_file', 'media_upload_image'); add_filter('media_upload_gallery', 'media_upload_gallery'); Index: wp-admin/edit-form-advanced.php =================================================================== --- wp-admin/edit-form-advanced.php (revision 18821) +++ wp-admin/edit-form-advanced.php (working copy) @@ -122,9 +122,8 @@ 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'] ) ) ) ) - add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', $post_type, 'side', 'low'); +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') ) add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $post_type, 'normal', 'core'); Index: wp-admin/network/settings.php =================================================================== --- wp-admin/network/settings.php (revision 18821) +++ wp-admin/network/settings.php (working copy) @@ -80,8 +80,8 @@ update_site_option( 'banned_email_domains', '' ); } - $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' ); - $checked_options = array( 'mu_media_buttons' => array(), 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 ); + $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', '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' ); + $checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 ); foreach ( $checked_options as $option_name => $option_unchecked_value ) { if ( ! isset( $_POST[$option_name] ) ) $_POST[$option_name] = $option_unchecked_value; @@ -270,15 +270,6 @@

- - - - - -

-
-
-