WordPress 3.8.2
[autoinstalls/wordpress.git] / wp-admin / includes / media.php
index 1000d15bf1faa2cf21097e01187b94fde94a419f..e2f78d63f4bfeace2313ad417e80feecc382defd 100644 (file)
@@ -1,23 +1,54 @@
 <?php
-
+/**
+ * WordPress Administration Media API.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * Defines the default media upload tabs
+ *
+ * @since 2.5.0
+ *
+ * @return array default tabs
+ */
 function media_upload_tabs() {
        $_default_tabs = array(
-               'type' => __('Choose File'), // handler action suffix => tab text
+               'type' => __('From Computer'), // handler action suffix => tab text
+               'type_url' => __('From URL'),
                'gallery' => __('Gallery'),
-               'library' => __('Media Library'),
+               'library' => __('Media Library')
        );
 
        return apply_filters('media_upload_tabs', $_default_tabs);
 }
 
+/**
+ * Adds the gallery tab back to the tabs array if post has image attachments
+ *
+ * @since 2.5.0
+ *
+ * @param array $tabs
+ * @return array $tabs with gallery if post has image attachment
+ */
 function update_gallery_tab($tabs) {
        global $wpdb;
+
        if ( !isset($_REQUEST['post_id']) ) {
                unset($tabs['gallery']);
                return $tabs;
        }
-       if ( intval($_REQUEST['post_id']) )
-               $attachments = intval($wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $_REQUEST['post_id'])));
+
+       $post_id = intval($_REQUEST['post_id']);
+
+       if ( $post_id )
+               $attachments = intval( $wpdb->get_var( $wpdb->prepare( "SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent = %d", $post_id ) ) );
+
+       if ( empty($attachments) ) {
+               unset($tabs['gallery']);
+               return $tabs;
+       }
 
        $tabs['gallery'] = sprintf(__('Gallery (%s)'), "<span id='attachments-count'>$attachments</span>");
 
@@ -25,74 +56,231 @@ function update_gallery_tab($tabs) {
 }
 add_filter('media_upload_tabs', 'update_gallery_tab');
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ */
 function the_media_upload_tabs() {
+       global $redir_tab;
        $tabs = media_upload_tabs();
+       $default = 'type';
 
        if ( !empty($tabs) ) {
                echo "<ul id='sidemenu'>\n";
-               if ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
+               if ( isset($redir_tab) && array_key_exists($redir_tab, $tabs) )
+                       $current = $redir_tab;
+               elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
                        $current = $_GET['tab'];
-               else {
-                       $keys = array_keys($tabs);
-                       $current = array_shift($keys);
-               }
+               else
+                       $current = apply_filters('media_upload_default_tab', $default);
+
                foreach ( $tabs as $callback => $text ) {
                        $class = '';
+
                        if ( $current == $callback )
                                $class = " class='current'";
-                       $href = add_query_arg(array('tab'=>$callback, 's'=>false, 'paged'=>false, 'post_mime_type'=>false, 'm'=>false));
-                       $link = "<a href='$href'$class>$text</a>";
-                       echo "\t<li id='tab-$callback'>$link</li>\n";
+
+                       $href = add_query_arg(array('tab' => $callback, 's' => false, 'paged' => false, 'post_mime_type' => false, 'm' => false));
+                       $link = "<a href='" . esc_url($href) . "'$class>$text</a>";
+                       echo "\t<li id='" . esc_attr("tab-$callback") . "'>$link</li>\n";
                }
                echo "</ul>\n";
        }
 }
 
-function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = false, $size='medium') {
-
-       $html = get_image_tag($id, $alt, $title, $align, $size);
-
-       $rel = $rel ? ' rel="attachment wp-att-'.attribute_escape($id).'"' : '';
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @param integer $id image attachment id
+ * @param string $caption image caption
+ * @param string $alt image alt attribute
+ * @param string $title image title attribute
+ * @param string $align image css alignment property
+ * @param string $url image src url
+ * @param string|bool $rel image rel attribute
+ * @param string $size image size (thumbnail, medium, large, full or added  with add_image_size() )
+ * @return string the html to insert into editor
+ */
+function get_image_send_to_editor($id, $caption, $title, $align, $url='', $rel = false, $size='medium', $alt = '') {
+
+       $html = get_image_tag($id, $alt, '', $align, $size);
+
+       $rel = $rel ? ' rel="attachment wp-att-' . esc_attr($id).'"' : '';
 
        if ( $url )
-               $html = "<a href='".attribute_escape($url)."'$rel>$html</a>";
+               $html = '<a href="' . esc_attr($url) . "\"$rel>$html</a>";
 
-       $html = apply_filters( 'image_send_to_editor', $html, $id, $alt, $title, $align, $url, $size );
+       $html = apply_filters( 'image_send_to_editor', $html, $id, $caption, $title, $align, $url, $size, $alt );
 
        return $html;
 }
 
+/**
+ * Adds image shortcode with caption to editor
+ *
+ * @since 2.6.0
+ *
+ * @param string $html
+ * @param integer $id
+ * @param string $caption image caption
+ * @param string $alt image alt attribute
+ * @param string $title image title attribute
+ * @param string $align image css alignment property
+ * @param string $url image src url
+ * @param string $size image size (thumbnail, medium, large, full or added with add_image_size() )
+ * @return string
+ */
+function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $alt = '' ) {
+
+       if ( empty($caption) || apply_filters( 'disable_captions', '' ) )
+               return $html;
+
+       $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
+
+       if ( ! preg_match( '/width=["\']([0-9]+)/', $html, $matches ) )
+               return $html;
+
+       $width = $matches[1];
+
+       $caption = str_replace( array("\r\n", "\r"), "\n", $caption);
+       $caption = preg_replace_callback( '/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption );
+       // convert any remaining line breaks to <br>
+       $caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '<br />', $caption );
+
+       $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
+       if ( empty($align) )
+               $align = 'none';
+
+       $shcode = '[caption id="' . $id . '" align="align' . $align     . '" width="' . $width . '"]' . $html . ' ' . $caption . '[/caption]';
+
+       return apply_filters( 'image_add_caption_shortcode', $shcode, $html );
+}
+add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
+
+/**
+ * Private preg_replace callback used in image_add_caption()
+ *
+ * @access private
+ * @since 3.4.0
+ */
+function _cleanup_image_add_caption( $matches ) {
+       // remove any line breaks from inside the tags
+       return preg_replace( '/[\r\n\t]+/', ' ', $matches[0] );
+}
+
+/**
+ * Adds image html to editor
+ *
+ * @since 2.5.0
+ *
+ * @param string $html
+ */
 function media_send_to_editor($html) {
-       ?>
+?>
 <script type="text/javascript">
-<!--
-top.send_to_editor('<?php echo addslashes($html); ?>');
-top.tb_remove();
--->
+/* <![CDATA[ */
+var win = window.dialogArguments || opener || parent || top;
+win.send_to_editor('<?php echo addslashes($html); ?>');
+/* ]]> */
 </script>
-       <?php
+<?php
        exit;
 }
 
-// this handles the file upload POST itself, creating the attachment post
-function media_handle_upload($file_id, $post_id, $post_data = array()) {
-       $overrides = array('test_form'=>false);
-       $file = wp_handle_upload($_FILES[$file_id], $overrides);
+/**
+ * This handles the file upload POST itself, creating the attachment post.
+ *
+ * @since 2.5.0
+ *
+ * @param string $file_id Index into the {@link $_FILES} array of the upload
+ * @param int $post_id The post ID the media is associated with
+ * @param array $post_data allows you to overwrite some of the attachment
+ * @param array $overrides allows you to override the {@link wp_handle_upload()} behavior
+ * @return int the ID of the attachment
+ */
+function media_handle_upload($file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false )) {
+
+       $time = current_time('mysql');
+       if ( $post = get_post($post_id) ) {
+               if ( substr( $post->post_date, 0, 4 ) > 0 )
+                       $time = $post->post_date;
+       }
+
+       $name = $_FILES[$file_id]['name'];
+       $file = wp_handle_upload($_FILES[$file_id], $overrides, $time);
 
        if ( isset($file['error']) )
-               return new wp_error( 'upload_error', $file['error'] );
+               return new WP_Error( 'upload_error', $file['error'] );
+
+       $name_parts = pathinfo($name);
+       $name = trim( substr( $name, 0, -(1 + strlen($name_parts['extension'])) ) );
 
        $url = $file['url'];
        $type = $file['type'];
        $file = $file['file'];
-       $title = preg_replace('/\.[^.]+$/', '', basename($file));
+       $title = $name;
        $content = '';
 
+       if ( preg_match( '#^audio#', $type ) ) {
+               $meta = wp_read_audio_metadata( $file );
+
+               if ( ! empty( $meta['title'] ) )
+                       $title = $meta['title'];
+
+               $content = '';
+
+               if ( ! empty( $title ) ) {
+
+                       if ( ! empty( $meta['album'] ) && ! empty( $meta['artist'] ) ) {
+                               /* translators: 1: audio track title, 2: album title, 3: artist name */
+                               $content .= sprintf( __( '"%1$s" from %2$s by %3$s.' ), $title, $meta['album'], $meta['artist'] );
+                       } else if ( ! empty( $meta['album'] ) ) {
+                               /* translators: 1: audio track title, 2: album title */
+                               $content .= sprintf( __( '"%1$s" from %2$s.' ), $title, $meta['album'] );
+                       } else if ( ! empty( $meta['artist'] ) ) {
+                               /* translators: 1: audio track title, 2: artist name */
+                               $content .= sprintf( __( '"%1$s" by %2$s.' ), $title, $meta['artist'] );
+                       } else {
+                               $content .= sprintf( __( '"%s".' ), $title );
+                       }
+
+               } else if ( ! empty( $meta['album'] ) ) {
+
+                       if ( ! empty( $meta['artist'] ) ) {
+                               /* translators: 1: audio album title, 2: artist name */
+                               $content .= sprintf( __( '%1$s by %2$s.' ), $meta['album'], $meta['artist'] );
+                       } else {
+                               $content .= $meta['album'] . '.';
+                       }
+
+               } else if ( ! empty( $meta['artist'] ) ) {
+
+                       $content .= $meta['artist'] . '.';
+
+               }
+
+               if ( ! empty( $meta['year'] ) )
+                       $content .= ' ' . sprintf( __( 'Released: %d.' ), $meta['year'] );
+
+               if ( ! empty( $meta['track_number'] ) ) {
+                       $track_number = explode( '/', $meta['track_number'] );
+                       if ( isset( $track_number[1] ) )
+                               $content .= ' ' . sprintf( __( 'Track %1$s of %2$s.' ), number_format_i18n( $track_number[0] ), number_format_i18n( $track_number[1] ) );
+                       else
+                               $content .= ' ' . sprintf( __( 'Track %1$s.' ), number_format_i18n( $track_number[0] ) );
+               }
+
+               if ( ! empty( $meta['genre'] ) )
+                       $content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
+
        // use image exif/iptc data for title and caption defaults if possible
-       if ( $image_meta = @wp_read_image_metadata($file) ) {
-               if ( trim($image_meta['title']) )
+       } elseif ( $image_meta = @wp_read_image_metadata( $file ) ) {
+               if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
                        $title = $image_meta['title'];
-               if ( trim($image_meta['caption']) )
+               if ( trim( $image_meta['caption'] ) )
                        $content = $image_meta['caption'];
        }
 
@@ -105,8 +293,12 @@ function media_handle_upload($file_id, $post_id, $post_data = array()) {
                'post_content' => $content,
        ), $post_data );
 
+       // This should never be set as it would then overwrite an existing attachment.
+       if ( isset( $attachment['ID'] ) )
+               unset( $attachment['ID'] );
+
        // Save the data
-       $id = wp_insert_attachment($attachment, $file, $post_parent);
+       $id = wp_insert_attachment($attachment, $file, $post_id);
        if ( !is_wp_error($id) ) {
                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
        }
@@ -115,104 +307,224 @@ function media_handle_upload($file_id, $post_id, $post_data = array()) {
 
 }
 
+/**
+ * This handles a sideloaded file in the same way as an uploaded file is handled by {@link media_handle_upload()}
+ *
+ * @since 2.6.0
+ *
+ * @param array $file_array Array similar to a {@link $_FILES} upload array
+ * @param int $post_id The post ID the media is associated with
+ * @param string $desc Description of the sideloaded file
+ * @param array $post_data allows you to overwrite some of the attachment
+ * @return int|object The ID of the attachment or a WP_Error on failure
+ */
+function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
+       $overrides = array('test_form'=>false);
+
+       $time = current_time( 'mysql' );
+       if ( $post = get_post( $post_id ) ) {
+               if ( substr( $post->post_date, 0, 4 ) > 0 )
+                       $time = $post->post_date;
+       }
+
+       $file = wp_handle_sideload( $file_array, $overrides, $time );
+       if ( isset($file['error']) )
+               return new WP_Error( 'upload_error', $file['error'] );
+
+       $url = $file['url'];
+       $type = $file['type'];
+       $file = $file['file'];
+       $title = preg_replace('/\.[^.]+$/', '', basename($file));
+       $content = '';
+
+       // use image exif/iptc data for title and caption defaults if possible
+       if ( $image_meta = @wp_read_image_metadata($file) ) {
+               if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
+                       $title = $image_meta['title'];
+               if ( trim( $image_meta['caption'] ) )
+                       $content = $image_meta['caption'];
+       }
+
+       if ( isset( $desc ) )
+               $title = $desc;
+
+       // Construct the attachment array
+       $attachment = array_merge( array(
+               'post_mime_type' => $type,
+               'guid' => $url,
+               'post_parent' => $post_id,
+               'post_title' => $title,
+               'post_content' => $content,
+       ), $post_data );
+
+       // This should never be set as it would then overwrite an existing attachment.
+       if ( isset( $attachment['ID'] ) )
+               unset( $attachment['ID'] );
+
+       // Save the attachment metadata
+       $id = wp_insert_attachment($attachment, $file, $post_id);
+       if ( !is_wp_error($id) )
+               wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+
+       return $id;
+}
 
-// wrap iframe content (produced by $content_func) in a doctype, html head/body etc
-// any additional function args will be passed to content_func
+/**
+ * Adds the iframe to display content for the media upload page
+ *
+ * @since 2.5.0
+ *
+ * @param array $content_func
+ */
 function wp_iframe($content_func /* ... */) {
+       _wp_admin_html_begin();
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
-<head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title>
 <?php
-wp_admin_css( 'css/global' );
-wp_admin_css();
-wp_admin_css( 'css/colors' );
+
+wp_enqueue_style( 'colors' );
+// Check callback name for 'media'
+if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
+       || ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) )
+       wp_enqueue_style( 'media' );
+wp_enqueue_style( 'ie' );
 ?>
 <script type="text/javascript">
 //<![CDATA[
-function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}else{ var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}}
+addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
+isRtl = <?php echo (int) is_rtl(); ?>;
 //]]>
 </script>
 <?php
+do_action('admin_enqueue_scripts', 'media-upload-popup');
+do_action('admin_print_styles-media-upload-popup');
+do_action('admin_print_styles');
+do_action('admin_print_scripts-media-upload-popup');
 do_action('admin_print_scripts');
+do_action('admin_head-media-upload-popup');
 do_action('admin_head');
+
 if ( is_string($content_func) )
        do_action( "admin_head_{$content_func}" );
 ?>
 </head>
-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>>
+<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-core-ui no-js">
+<script type="text/javascript">
+document.body.className = document.body.className.replace('no-js', 'js');
+</script>
 <?php
        $args = func_get_args();
        $args = array_slice($args, 1);
        call_user_func_array($content_func, $args);
+
+       do_action('admin_print_footer_scripts');
 ?>
+<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
 </body>
 </html>
 <?php
 }
 
-function media_buttons() {
-       global $post_ID, $temp_ID;
-       $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
-       $context = apply_filters('media_buttons_context', __('Add media: %s'));
-       $media_upload_iframe_src = "media-upload.php?post_id=$uploading_iframe_ID";
-       $media_title = __('Add Media');
-       $image_upload_iframe_src = apply_filters('image_upload_iframe_src', "$media_upload_iframe_src&amp;type=image");
-       $image_title = __('Add an Image');
-       $video_upload_iframe_src = apply_filters('video_upload_iframe_src', "$media_upload_iframe_src&amp;type=video");
-       $video_title = __('Add Video');
-       $audio_upload_iframe_src = apply_filters('audio_upload_iframe_src', "$media_upload_iframe_src&amp;type=audio");
-       $audio_title = __('Add Audio');
-       $out = <<<EOF
-
-       <a href="{$image_upload_iframe_src}&amp;TB_iframe=true&amp;height=500&amp;width=640" class="thickbox" title='$image_title'><img src='images/media-button-image.gif' alt='$image_title' /></a>
-       <a href="{$video_upload_iframe_src}&amp;TB_iframe=true&amp;height=500&amp;width=640" class="thickbox" title='$video_title'><img src='images/media-button-video.gif' alt='$video_title' /></a>
-       <a href="{$audio_upload_iframe_src}&amp;TB_iframe=true&amp;height=500&amp;width=640" class="thickbox" title='$audio_title'><img src='images/media-button-music.gif' alt='$audio_title' /></a>
-       <a href="{$media_upload_iframe_src}&amp;TB_iframe=true&amp;height=500&amp;width=640" class="thickbox" title='$media_title'><img src='images/media-button-other.gif' alt='$media_title' /></a>
-
-EOF;
-       printf($context, $out);
+/**
+ * Adds the media button to the editor
+ *
+ * @since 2.5.0
+ *
+ * @param string $editor_id
+ */
+function media_buttons($editor_id = 'content') {
+       $post = get_post();
+       if ( ! $post && ! empty( $GLOBALS['post_ID'] ) )
+               $post = $GLOBALS['post_ID'];
+
+       wp_enqueue_media( array(
+               'post' => $post
+       ) );
+
+       $img = '<span class="wp-media-buttons-icon"></span> ';
+
+       echo '<a href="#" id="insert-media-button" class="button insert-media add_media" data-editor="' . esc_attr( $editor_id ) . '" title="' . esc_attr__( 'Add Media' ) . '">' . $img . __( 'Add Media' ) . '</a>';
+
+       // Don't use this filter. Want to add a button? Use the media_buttons action.
+       $legacy_filter = apply_filters('media_buttons_context', ''); // deprecated
+
+       if ( $legacy_filter ) {
+               // #WP22559. Close <a> if a plugin started by closing <a> to open their own <a> tag.
+               if ( 0 === stripos( trim( $legacy_filter ), '</a>' ) )
+                       $legacy_filter .= '</a>';
+               echo $legacy_filter;
+       }
 }
 add_action( 'media_buttons', 'media_buttons' );
 
-function media_buttons_head() {
-$siteurl = get_option('siteurl');
-echo "<style type='text/css' media='all'>
-       @import '{$siteurl}/wp-includes/js/thickbox/thickbox.css?1';
-       div#TB_title {
-               background-color: #222222;
-               color: #cfcfcf;
-       }
-       div#TB_title a, div#TB_title a:visited {
-               color: #cfcfcf;
-       }
-</style>\n";
-}
+function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) {
+       global $post_ID;
 
-add_action( 'admin_print_scripts', 'media_buttons_head' );
+       if ( empty( $post_id ) )
+               $post_id = $post_ID;
 
-function media_admin_css() {
-       wp_admin_css('css/media');
-}
+       $upload_iframe_src = add_query_arg( 'post_id', (int) $post_id, admin_url('media-upload.php') );
+
+       if ( $type && 'media' != $type )
+               $upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
+
+       if ( ! empty( $tab ) )
+               $upload_iframe_src = add_query_arg('tab', $tab, $upload_iframe_src);
 
-add_action('media_upload_media', 'media_upload_handler');
+       $upload_iframe_src = apply_filters($type . '_upload_iframe_src', $upload_iframe_src);
 
+       return add_query_arg('TB_iframe', true, $upload_iframe_src);
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @return mixed void|object WP_Error on failure
+ */
 function media_upload_form_handler() {
        check_admin_referer('media-form');
 
+       $errors = null;
+
+       if ( isset($_POST['send']) ) {
+               $keys = array_keys($_POST['send']);
+               $send_id = (int) array_shift($keys);
+       }
+
        if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
                $post = $_post = get_post($attachment_id, ARRAY_A);
+
+               if ( !current_user_can( 'edit_post', $attachment_id ) )
+                       continue;
+
                if ( isset($attachment['post_content']) )
                        $post['post_content'] = $attachment['post_content'];
                if ( isset($attachment['post_title']) )
                        $post['post_title'] = $attachment['post_title'];
                if ( isset($attachment['post_excerpt']) )
                        $post['post_excerpt'] = $attachment['post_excerpt'];
+               if ( isset($attachment['menu_order']) )
+                       $post['menu_order'] = $attachment['menu_order'];
+
+               if ( isset($send_id) && $attachment_id == $send_id ) {
+                       if ( isset($attachment['post_parent']) )
+                               $post['post_parent'] = $attachment['post_parent'];
+               }
 
                $post = apply_filters('attachment_fields_to_save', $post, $attachment);
 
+               if ( isset($attachment['image_alt']) ) {
+                       $image_alt = wp_unslash( $attachment['image_alt'] );
+                       if ( $image_alt != get_post_meta($attachment_id, '_wp_attachment_image_alt', true) ) {
+                               $image_alt = wp_strip_all_tags( $image_alt, true );
+                               // update_meta expects slashed
+                               update_post_meta( $attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
+                       }
+               }
+
                if ( isset($post['errors']) ) {
                        $errors[$attachment_id] = $post['errors'];
                        unset($post['errors']);
@@ -221,24 +533,34 @@ function media_upload_form_handler() {
                if ( $post != $_post )
                        wp_update_post($post);
 
-               foreach ( get_attachment_taxonomies($post) as $t )
+               foreach ( get_attachment_taxonomies($post) as $t ) {
                        if ( isset($attachment[$t]) )
                                wp_set_object_terms($attachment_id, array_map('trim', preg_split('/,+/', $attachment[$t])), $t, false);
+               }
        }
 
-       if ( isset($_POST['insert-gallery']) )
-               return media_send_to_editor('[gallery]');
+       if ( isset($_POST['insert-gallery']) || isset($_POST['update-gallery']) ) { ?>
+               <script type="text/javascript">
+               /* <![CDATA[ */
+               var win = window.dialogArguments || opener || parent || top;
+               win.tb_remove();
+               /* ]]> */
+               </script>
+               <?php
+               exit;
+       }
 
-       if ( isset($_POST['send']) ) {
-               $keys = array_keys($_POST['send']);
-               $send_id = (int) array_shift($keys);
-               $attachment = $_POST['attachments'][$send_id];
-               $html = $attachment['post_title'];
+       if ( isset($send_id) ) {
+               $attachment = wp_unslash( $_POST['attachments'][$send_id] );
+
+               $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
                if ( !empty($attachment['url']) ) {
-                       if ( strpos($attachment['url'], 'attachment_id') || false !== strpos($attachment['url'], get_permalink($_POST['post_id'])) )
-                               $rel = " rel='attachment wp-att-".attribute_escape($send_id)."'";
+                       $rel = '';
+                       if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'] )
+                               $rel = " rel='attachment wp-att-" . esc_attr($send_id) . "'";
                        $html = "<a href='{$attachment['url']}'$rel>$html</a>";
                }
+
                $html = apply_filters('media_send_to_editor', $html, $send_id, $attachment);
                return media_send_to_editor($html);
        }
@@ -246,8 +568,19 @@ function media_upload_form_handler() {
        return $errors;
 }
 
-function media_upload_image() {
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @return mixed
+ */
+function wp_media_upload_handler() {
+       $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);
@@ -258,54 +591,37 @@ function media_upload_image() {
        }
 
        if ( !empty($_POST['insertonlybutton']) ) {
-               $src = $_POST['insertonly']['src'];
+               $src = $_POST['src'];
                if ( !empty($src) && !strpos($src, '://') )
                        $src = "http://$src";
-               $alt = attribute_escape($_POST['insertonly']['alt']);
-               if ( isset($_POST['insertonly']['align']) ) {
-                       $align = attribute_escape($_POST['insertonly']['align']);
-                       $class = " class='align$align'";
-               }
-               if ( !empty($src) )
-                       $html = "<img src='$src' alt='$alt'$class />";
-               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['media_type'] ) && 'image' != $_POST['media_type'] ) {
+                       $title = esc_html( wp_unslash( $_POST['title'] ) );
+                       if ( empty( $title ) )
+                               $title = esc_html( basename( $src ) );
 
-       if ( isset($_POST['save']) )
-               $errors['upload_notice'] = __('Saved.');
+                       if ( $title && $src )
+                               $html = "<a href='" . esc_url($src) . "'>$title</a>";
 
-       return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
-}
+                       $type = 'file';
+                       if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
+                               && ( 'audio' == $ext_type || 'video' == $ext_type ) )
+                                       $type = $ext_type;
 
-function media_upload_audio() {
-       if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-               // 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;
+                       $html = apply_filters( $type . '_send_to_editor_url', $html, esc_url_raw( $src ), $title );
+               } else {
+                       $align = '';
+                       $alt = esc_attr( wp_unslash( $_POST['alt'] ) );
+                       if ( isset($_POST['align']) ) {
+                               $align = esc_attr( wp_unslash( $_POST['align'] ) );
+                               $class = " class='align$align'";
+                       }
+                       if ( !empty($src) )
+                               $html = "<img src='" . esc_url($src) . "' alt='$alt'$class />";
+
+                       $html = apply_filters( 'image_send_to_editor_url', $html, esc_url_raw( $src ), $alt, $align );
                }
-       }
 
-       if ( !empty($_POST['insertonlybutton']) ) {
-               $href = $_POST['insertonly']['href'];
-               if ( !empty($href) && !strpos($href, '://') )
-                       $href = "http://$href";
-               $title = attribute_escape($_POST['insertonly']['title']);
-               if ( empty($title) )
-                       $title = basename($href);
-               if ( !empty($title) && !empty($href) )
-                       $html = "<a href='$href' >$title</a>";
                return media_send_to_editor($html);
        }
 
@@ -318,89 +634,77 @@ function media_upload_audio() {
                        $errors = $return;
        }
 
-       if ( isset($_POST['save']) )
+       if ( isset($_POST['save']) ) {
                $errors['upload_notice'] = __('Saved.');
-
-       return wp_iframe( 'media_upload_type_form', 'audio', $errors, $id );
-}
-
-function media_upload_video() {
-       if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-               // 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 = attribute_escape($_POST['insertonly']['title']);
-               if ( empty($title) )
-                       $title = basename($href);
-               if ( !empty($title) && !empty($href) )
-                       $html = "<a href='$href' >$title</a>";
-               return media_send_to_editor($html);
+               return media_upload_gallery();
        }
 
-       if ( !empty($_POST) ) {
-               $return = media_upload_form_handler();
-
-               if ( is_string($return) )
-                       return $return;
-               if ( is_array($return) )
-                       $errors = $return;
+       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 );
        }
 
-       if ( isset($_POST['save']) )
-               $errors['upload_notice'] = __('Saved.');
-
-       return wp_iframe( 'media_upload_type_form', 'video', $errors, $id );
+       return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
 }
 
-function media_upload_file() {
-       if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-               // Upload File button was clicked
-               $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-               unset($_FILES);
+/**
+ * Download an image from the specified URL and attach it to a post.
+ *
+ * @since 2.6.0
+ *
+ * @param string $file The URL of the image to download
+ * @param int $post_id The post ID the media is to be associated with
+ * @param string $desc Optional. Description of the image
+ * @return string|WP_Error Populated HTML img tag on success
+ */
+function media_sideload_image($file, $post_id, $desc = null) {
+       if ( ! empty($file) ) {
+               // Download file to temp location
+               $tmp = download_url( $file );
+
+               // Set variables for storage
+               // fix file filename for query strings
+               preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
+               $file_array['name'] = basename($matches[0]);
+               $file_array['tmp_name'] = $tmp;
+
+               // If error storing temporarily, unlink
+               if ( is_wp_error( $tmp ) ) {
+                       @unlink($file_array['tmp_name']);
+                       $file_array['tmp_name'] = '';
+               }
+
+               // do the validation and storage stuff
+               $id = media_handle_sideload( $file_array, $post_id, $desc );
+               // If error storing permanently, unlink
                if ( is_wp_error($id) ) {
-                       $errors['upload_error'] = $id;
-                       $id = false;
+                       @unlink($file_array['tmp_name']);
+                       return $id;
                }
-       }
 
-       if ( !empty($_POST['insertonlybutton']) ) {
-               $href = $_POST['insertonly']['href'];
-               if ( !empty($href) && !strpos($href, '://') )
-                       $href = "http://$href";
-               $title = attribute_escape($_POST['insertonly']['title']);
-               if ( empty($title) )
-                       $title = basename($href);
-               if ( !empty($title) && !empty($href) )
-                       $html = "<a href='$href' >$title</a>";
-               return media_send_to_editor($html);
+               $src = wp_get_attachment_url( $id );
        }
 
-       if ( !empty($_POST) ) {
-               $return = media_upload_form_handler();
-
-               if ( is_string($return) )
-                       return $return;
-               if ( is_array($return) )
-                       $errors = $return;
+       // Finally check to make sure the file has been saved, then return the html
+       if ( ! empty($src) ) {
+               $alt = isset($desc) ? esc_attr($desc) : '';
+               $html = "<img src='$src' alt='$alt' />";
+               return $html;
        }
-
-       if ( isset($_POST['save']) )
-               $errors['upload_notice'] = __('Saved.');
-
-       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();
+
        if ( !empty($_POST) ) {
                $return = media_upload_form_handler();
 
@@ -410,10 +714,19 @@ function media_upload_gallery() {
                        $errors = $return;
        }
 
+       wp_enqueue_script('admin-gallery');
        return wp_iframe( 'media_upload_gallery_form', $errors );
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @return unknown
+ */
 function media_upload_library() {
+       $errors = array();
        if ( !empty($_POST) ) {
                $return = media_upload_form_handler();
 
@@ -426,82 +739,215 @@ function media_upload_library() {
        return wp_iframe( 'media_upload_library_form', $errors );
 }
 
-function image_attachment_fields_to_edit($form_fields, $post) {
-       if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
-               $form_fields['post_title']['required'] = true;
-               $form_fields['post_excerpt']['label'] = __('Caption');
-               $form_fields['post_excerpt']['helps'][] = __('Alternate text, e.g. "The Mona Lisa"');
-
-               $form_fields['post_content']['label'] = __('Description');
+/**
+ * Retrieve HTML for the image alignment radio buttons with the specified one checked.
+ *
+ * @since 2.7.0
+ *
+ * @param object $post
+ * @param string $checked
+ * @return string
+ */
+function image_align_input_fields( $post, $checked = '' ) {
+
+       if ( empty($checked) )
+               $checked = get_user_setting('align', 'none');
+
+       $alignments = array('none' => __('None'), 'left' => __('Left'), 'center' => __('Center'), 'right' => __('Right'));
+       if ( !array_key_exists( (string) $checked, $alignments ) )
+               $checked = 'none';
+
+       $out = array();
+       foreach ( $alignments as $name => $label ) {
+               $name = esc_attr($name);
+               $out[] = "<input type='radio' name='attachments[{$post->ID}][align]' id='image-align-{$name}-{$post->ID}' value='$name'".
+                       ( $checked == $name ? " checked='checked'" : "" ) .
+                       " /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>$label</label>";
+       }
+       return join("\n", $out);
+}
 
-               $thumb = wp_get_attachment_thumb_url($post->ID);
+/**
+ * Retrieve HTML for the size radio buttons with the specified one checked.
+ *
+ * @since 2.7.0
+ *
+ * @param object $post
+ * @param bool|string $check
+ * @return array
+ */
+function image_size_input_fields( $post, $check = '' ) {
+
+               // get a list of the actual pixel dimensions of each possible intermediate version of this image
+               $size_names = apply_filters( 'image_size_names_choose', array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size')) );
+
+               if ( empty($check) )
+                       $check = get_user_setting('imgsize', 'medium');
+
+               foreach ( $size_names as $size => $label ) {
+                       $downsize = image_downsize($post->ID, $size);
+                       $checked = '';
+
+                       // is this size selectable?
+                       $enabled = ( $downsize[3] || 'full' == $size );
+                       $css_id = "image-size-{$size}-{$post->ID}";
+                       // if this size is the default but that's not available, don't select it
+                       if ( $size == $check ) {
+                               if ( $enabled )
+                                       $checked = " checked='checked'";
+                               else
+                                       $check = '';
+                       } elseif ( !$check && $enabled && 'thumbnail' != $size ) {
+                               // if $check is not enabled, default to the first available size that's bigger than a thumbnail
+                               $check = $size;
+                               $checked = " checked='checked'";
+                       }
+
+                       $html = "<div class='image-size-item'><input type='radio' " . disabled( $enabled, false, false ) . "name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'$checked />";
+
+                       $html .= "<label for='{$css_id}'>$label</label>";
+                       // only show the dimensions if that choice is available
+                       if ( $enabled )
+                               $html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d&nbsp;&times;&nbsp;%d)", $downsize[1], $downsize[2] ). "</label>";
+
+                       $html .= '</div>';
+
+                       $out[] = $html;
+               }
 
-               $form_fields['align'] = array(
-                       'label' => __('Alignment'),
-                       'input' => 'html',
-                       'html'  => "
-                               <input type='radio' name='attachments[$post->ID][align]' id='image-align-none-$post->ID' value='none' checked='checked' />
-                               <label for='image-align-none-$post->ID' class='align image-align-none-label'>" . __('None') . "</label>
-                               <input type='radio' name='attachments[$post->ID][align]' id='image-align-left-$post->ID' value='left' />
-                               <label for='image-align-left-$post->ID' class='align image-align-left-label'>" . __('Left') . "</label>
-                               <input type='radio' name='attachments[$post->ID][align]' id='image-align-center-$post->ID' value='center' />
-                               <label for='image-align-center-$post->ID' class='align image-align-center-label'>" . __('Center') . "</label>
-                               <input type='radio' name='attachments[$post->ID][align]' id='image-align-right-$post->ID' value='right' />
-                               <label for='image-align-right-$post->ID' class='align image-align-right-label'>" . __('Right') . "</label>\n",
-               );
-               $form_fields['image-size'] = array(
+               return array(
                        'label' => __('Size'),
                        'input' => 'html',
-                       'html'  => "
-                               " . ( $thumb ? "<input type='radio' name='attachments[$post->ID][image-size]' id='image-size-thumb-$post->ID' value='thumbnail' />
-                               <label for='image-size-thumb-$post->ID'>" . __('Thumbnail') . "</label>
-                               " : '' ) . "<input type='radio' name='attachments[$post->ID][image-size]' id='image-size-medium-$post->ID' value='medium' checked='checked' />
-                               <label for='image-size-medium-$post->ID'>" . __('Medium') . "</label>
-                               <input type='radio' name='attachments[$post->ID][image-size]' id='image-size-full-$post->ID' value='full' />
-                               <label for='image-size-full-$post->ID'>" . __('Full size') . "</label>",
+                       'html'  => join("\n", $out),
                );
-       }
-       return $form_fields;
 }
 
-add_filter('attachment_fields_to_edit', 'image_attachment_fields_to_edit', 10, 2);
+/**
+ * Retrieve HTML for the Link URL buttons with the default link type as specified.
+ *
+ * @since 2.7.0
+ *
+ * @param object $post
+ * @param string $url_type
+ * @return string
+ */
+function image_link_input_fields($post, $url_type = '') {
+
+       $file = wp_get_attachment_url($post->ID);
+       $link = get_attachment_link($post->ID);
+
+       if ( empty($url_type) )
+               $url_type = get_user_setting('urlbutton', 'post');
+
+       $url = '';
+       if ( $url_type == 'file' )
+               $url = $file;
+       elseif ( $url_type == 'post' )
+               $url = $link;
+
+       return "
+       <input type='text' class='text urlfield' name='attachments[$post->ID][url]' value='" . esc_attr($url) . "' /><br />
+       <button type='button' class='button urlnone' data-link-url=''>" . __('None') . "</button>
+       <button type='button' class='button urlfile' data-link-url='" . esc_attr($file) . "'>" . __('File URL') . "</button>
+       <button type='button' class='button urlpost' data-link-url='" . esc_attr($link) . "'>" . __('Attachment Post URL') . "</button>
+";
+}
+
+function wp_caption_input_textarea($edit_post) {
+       // post data is already escaped
+       $name = "attachments[{$edit_post->ID}][post_excerpt]";
+
+       return '<textarea name="' . $name . '" id="' . $name . '">' . $edit_post->post_excerpt . '</textarea>';
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @param array $form_fields
+ * @param object $post
+ * @return array
+ */
+function image_attachment_fields_to_edit($form_fields, $post) {
+       return $form_fields;
+}
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @param array $form_fields
+ * @param object $post {@internal $post not used}}
+ * @return array
+ */
 function media_single_attachment_fields_to_edit( $form_fields, $post ) {
        unset($form_fields['url'], $form_fields['align'], $form_fields['image-size']);
        return $form_fields;
 }
 
-function image_attachment_fields_to_save($post, $attachment) {
-       if ( substr($post['post_mime_type'], 0, 5) == 'image' ) {
-               if ( strlen(trim($post['post_title'])) == 0 ) {
-                       $post['post_title'] = preg_replace('/\.\w+$/', '', basename($post['guid']));
-                       $post['errors']['post_title']['errors'][] = __('Empty Title filled from filename.');
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.8.0
+ *
+ * @param array $form_fields
+ * @param object $post {@internal $post not used}}
+ * @return array
+ */
+function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
+       unset($form_fields['image_url']);
+       return $form_fields;
+}
+
+/**
+ * Filters input from media_upload_form_handler() and assigns a default
+ * post_title from the file name if none supplied.
+ *
+ * Illustrates the use of the attachment_fields_to_save filter
+ * which can be used to add default values to any field before saving to DB.
+ *
+ * @since 2.5.0
+ *
+ * @param object $post
+ * @param array $attachment {@internal $attachment not used}}
+ * @return array
+ */
+function image_attachment_fields_to_save( $post, $attachment ) {
+       if ( substr( $post['post_mime_type'], 0, 5 ) == 'image' ) {
+               if ( strlen( trim( $post['post_title'] ) ) == 0 ) {
+                       $attachment_url = ( isset( $post['attachment_url'] ) ) ? $post['attachment_url'] : $post['guid'];
+                       $post['post_title'] = preg_replace( '/\.\w+$/', '', wp_basename( $attachment_url ) );
+                       $post['errors']['post_title']['errors'][] = __( 'Empty Title filled from filename.' );
                }
        }
 
        return $post;
 }
 
-add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2);
-
+add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @param string $html
+ * @param integer $attachment_id
+ * @param array $attachment
+ * @return array
+ */
 function image_media_send_to_editor($html, $attachment_id, $attachment) {
-       $post =& get_post($attachment_id);
+       $post = get_post($attachment_id);
        if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
                $url = $attachment['url'];
-
-               if ( isset($attachment['align']) )
-                       $align = $attachment['align'];
-               else
-                       $align = 'none';
-
-               if ( !empty($attachment['image-size']) )
-                       $size = $attachment['image-size'];
-               else
-                       $size = 'medium';
-
+               $align = !empty($attachment['align']) ? $attachment['align'] : 'none';
+               $size = !empty($attachment['image-size']) ? $attachment['image-size'] : 'medium';
+               $alt = !empty($attachment['image_alt']) ? $attachment['image_alt'] : '';
                $rel = ( $url == get_attachment_link($attachment_id) );
 
-               return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size);
+               return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt);
        }
 
        return $html;
@@ -509,60 +955,77 @@ function image_media_send_to_editor($html, $attachment_id, $attachment) {
 
 add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3);
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @param object $post
+ * @param array $errors
+ * @return array
+ */
 function get_attachment_fields_to_edit($post, $errors = null) {
        if ( is_int($post) )
-               $post =& get_post($post);
+               $post = get_post($post);
        if ( is_array($post) )
-               $post = (object) $post;
+               $post = new WP_Post( (object) $post );
+
+       $image_url = wp_get_attachment_url($post->ID);
 
        $edit_post = sanitize_post($post, 'edit');
-       $file = wp_get_attachment_url($post->ID);
-       $link = get_attachment_link($post->ID);
 
        $form_fields = array(
                'post_title'   => array(
                        'label'      => __('Title'),
-                       'value'      => $edit_post->post_title,
+                       'value'      => $edit_post->post_title
                ),
+               'image_alt'   => array(),
                'post_excerpt' => array(
                        'label'      => __('Caption'),
-                       'value'      => $edit_post->post_excerpt,
+                       'input'      => 'html',
+                       'html'       => wp_caption_input_textarea($edit_post)
                ),
                'post_content' => array(
                        'label'      => __('Description'),
                        'value'      => $edit_post->post_content,
-                       'input'      => 'textarea',
+                       'input'      => 'textarea'
                ),
                'url'          => array(
                        'label'      => __('Link URL'),
                        'input'      => 'html',
-                       'html'       => "
-                               <input type='text' name='attachments[$post->ID][url]' value='" . attribute_escape($file) . "' /><br />
-                               <button type='button' class='button url-$post->ID' value=''>" . __('None') . "</button>
-                               <button type='button' class='button url-$post->ID' value='" . attribute_escape($file) . "'>" . __('File URL') . "</button>
-                               <button type='button' class='button url-$post->ID' value='" . attribute_escape($link) . "'>" . __('Post URL') . "</button>
-                               <script type='text/javascript'>
-                               jQuery('button.url-$post->ID').bind('click', function(){jQuery(this).siblings('input').val(this.value);});
-                               </script>\n",
-                       'helps'      => __('Enter a link URL or click above for presets.'),
+                       'html'       => image_link_input_fields($post, get_option('image_default_link_type')),
+                       'helps'      => __('Enter a link URL or click above for presets.')
+               ),
+               'menu_order'   => array(
+                       'label'      => __('Order'),
+                       'value'      => $edit_post->menu_order
                ),
+               'image_url'     => array(
+                       'label'      => __('File URL'),
+                       'input'      => 'html',
+                       'html'       => "<input type='text' class='text urlfield' readonly='readonly' name='attachments[$post->ID][url]' value='" . esc_attr($image_url) . "' /><br />",
+                       'value'      => wp_get_attachment_url($post->ID),
+                       'helps'      => __('Location of the uploaded file.')
+               )
        );
 
        foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
                $t = (array) get_taxonomy($taxonomy);
+               if ( ! $t['public'] || ! $t['show_ui'] )
+                       continue;
                if ( empty($t['label']) )
                        $t['label'] = $taxonomy;
                if ( empty($t['args']) )
                        $t['args'] = array();
 
                $terms = get_object_term_cache($post->ID, $taxonomy);
-               if ( empty($terms) )
+               if ( false === $terms )
                        $terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
 
                $values = array();
 
                foreach ( $terms as $term )
-                       $values[] = $term->name;
+                       $values[] = $term->slug;
                $t['value'] = join(', ', $values);
 
                $form_fields[$taxonomy] = $t;
@@ -572,98 +1035,187 @@ function get_attachment_fields_to_edit($post, $errors = null) {
        // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing )
        $form_fields = array_merge_recursive($form_fields, (array) $errors);
 
+       // This was formerly in image_attachment_fields_to_edit().
+       if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
+               $alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
+               if ( empty($alt) )
+                       $alt = '';
+
+               $form_fields['post_title']['required'] = true;
+
+               $form_fields['image_alt'] = array(
+                       'value' => $alt,
+                       'label' => __('Alternative Text'),
+                       'helps' => __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;')
+               );
+
+               $form_fields['align'] = array(
+                       'label' => __('Alignment'),
+                       'input' => 'html',
+                       'html'  => image_align_input_fields($post, get_option('image_default_align')),
+               );
+
+               $form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') );
+
+       } else {
+               unset( $form_fields['image_alt'] );
+       }
+
        $form_fields = apply_filters('attachment_fields_to_edit', $form_fields, $post);
 
        return $form_fields;
 }
 
+/**
+ * Retrieve HTML for media items of post gallery.
+ *
+ * The HTML markup retrieved will be created for the progress of SWF Upload
+ * component. Will also create link for showing and hiding the form to modify
+ * the image attachment.
+ *
+ * @since 2.5.0
+ *
+ * @param int $post_id Optional. Post ID.
+ * @param array $errors Errors for attachment, if any.
+ * @return string
+ */
 function get_media_items( $post_id, $errors ) {
+       $attachments = array();
        if ( $post_id ) {
                $post = get_post($post_id);
                if ( $post && $post->post_type == 'attachment' )
                        $attachments = array($post->ID => $post);
                else
-                       $attachments = get_children("post_parent=$post_id&post_type=attachment&orderby=menu_order ASC, ID&order=DESC");
+                       $attachments = get_children( array( 'post_parent' => $post_id, 'post_type' => 'attachment', 'orderby' => 'menu_order ASC, ID', 'order' => 'DESC') );
        } else {
                if ( is_array($GLOBALS['wp_the_query']->posts) )
                        foreach ( $GLOBALS['wp_the_query']->posts as $attachment )
                                $attachments[$attachment->ID] = $attachment;
        }
 
-       if ( empty($attachments) )
-               return '';
-
-       foreach ( $attachments as $id => $attachment )
+       $output = '';
+       foreach ( (array) $attachments as $id => $attachment ) {
+               if ( $attachment->post_status == 'trash' )
+                       continue;
                if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) )
-                       $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress'><div class='bar'></div></div><div id='media-upload-error-$id'></div><div class='filename'></div>$item\n</div>";
+                       $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress hidden'><div class='bar'></div></div><div id='media-upload-error-$id' class='hidden'></div><div class='filename hidden'></div>$item\n</div>";
+       }
 
        return $output;
 }
 
+/**
+ * Retrieve HTML form for modifying the image attachment.
+ *
+ * @since 2.5.0
+ *
+ * @param int $attachment_id Attachment ID for modification.
+ * @param string|array $args Optional. Override defaults.
+ * @return string HTML form for attachment.
+ */
 function get_media_item( $attachment_id, $args = null ) {
-       $default_args = array( 'errors' => null, 'send' => true, 'delete' => true, 'toggle' => true );
-       $args = wp_parse_args( $args, $default_args );
-       extract( $args, EXTR_SKIP );
+       global $redir_tab;
 
-       global $post_mime_types;
-       if ( ( $attachment_id = intval($attachment_id) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) )
+       if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) )
                $thumb_url = $thumb_url[0];
        else
-               return false;
+               $thumb_url = false;
 
-       $title_label = __('Title');
-       $description_label = __('Description');
-       $tags_label = __('Tags');
+       $post = get_post( $attachment_id );
+       $current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0;
 
-       $toggle_on = __('Show');
-       $toggle_off = __('Hide');
+       $default_args = array( 'errors' => null, 'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true );
+       $args = wp_parse_args( $args, $default_args );
+       $args = apply_filters( 'get_media_item_args', $args );
+       extract( $args, EXTR_SKIP );
 
-       $post = get_post($attachment_id);
+       $toggle_on  = __( 'Show' );
+       $toggle_off = __( 'Hide' );
 
-       $filename = basename($post->guid);
-       $title = attribute_escape($post->post_title);
-       $description = attribute_escape($post->post_content);
-       if ( $_tags = get_the_tags($attachment_id) ) {
+       $filename = esc_html( wp_basename( $post->guid ) );
+       $title = esc_attr( $post->post_title );
+
+       if ( $_tags = get_the_tags( $attachment_id ) ) {
                foreach ( $_tags as $tag )
                        $tags[] = $tag->name;
-               $tags = attribute_escape(join(', ', $tags));
+               $tags = esc_attr( join( ', ', $tags ) );
        }
 
-       if ( isset($post_mime_types) ) {
-               $keys = array_keys(wp_match_mime_types(array_keys($post_mime_types), $post->post_mime_type));
-               $type = array_shift($keys);
-               $type = "<input type='hidden' id='type-of-$attachment_id' value='" . attribute_escape( $type ) . "' />";
-       }
+       $post_mime_types = get_post_mime_types();
+       $keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
+       $type = array_shift( $keys );
+       $type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
 
-       $form_fields = get_attachment_fields_to_edit($post, $errors);
+       $form_fields = get_attachment_fields_to_edit( $post, $errors );
 
        if ( $toggle ) {
-               $class = empty($errors) ? 'startclosed' : 'startopen';
+               $class = empty( $errors ) ? 'startclosed' : 'startopen';
                $toggle_links = "
        <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
        <a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
        } else {
-               $class = 'form-table';
+               $class = '';
                $toggle_links = '';
        }
 
        $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
+       $display_title = $show_title ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . "</span></div>" : '';
 
-       $item = "
-       $type
-       $toggle_links
-       <div class='filename new'>$display_title</div>
+       $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
+       $order = '';
+
+       foreach ( $form_fields as $key => $val ) {
+               if ( 'menu_order' == $key ) {
+                       if ( $gallery )
+                               $order = "<div class='menu_order'> <input class='menu_order_input' type='text' id='attachments[$attachment_id][menu_order]' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ). "' /></div>";
+                       else
+                               $order = "<input type='hidden' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ) . "' />";
+
+                       unset( $form_fields['menu_order'] );
+                       break;
+               }
+       }
+
+       $media_dims = '';
+       $meta = wp_get_attachment_metadata( $post->ID );
+       if ( isset( $meta['width'], $meta['height'] ) )
+               $media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+       $media_dims = apply_filters( 'media_meta', $media_dims, $post );
+
+       $image_edit_button = '';
+       if ( wp_attachment_is_image( $post->ID ) && wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
+               $nonce = wp_create_nonce( "image_editor-$post->ID" );
+               $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
+       }
+
+       $attachment_url = get_permalink( $attachment_id );
+
+       $item = "
+       $type_html
+       $toggle_links
+       $order
+       $display_title
        <table class='slidetoggle describe $class'>
-               <thead class='media-item-info'>
-               <tr>
-                       <td class='A1B1' rowspan='4'><img class='thumbnail' src='$thumb_url' alt='' /></td>
-                       <td>$filename</td>
-               </tr>
-               <tr><td>$post->post_mime_type</td></tr>
-               <tr><td>" . mysql2date($post->post_date, get_option('time_format')) . "</td></tr>
-               <tr><td>" . apply_filters('media_meta', '', $post) . "</td></tr>
+               <thead class='media-item-info' id='media-head-$post->ID'>
+               <tr valign='top'>
+                       <td class='A1B1' id='thumbnail-head-$post->ID'>
+                       <p><a href='$attachment_url' target='_blank'><img class='thumbnail' src='$thumb_url' alt='' /></a></p>
+                       <p>$image_edit_button</p>
+                       </td>
+                       <td>
+                       <p><strong>" . __('File name:') . "</strong> $filename</p>
+                       <p><strong>" . __('File type:') . "</strong> $post->post_mime_type</p>
+                       <p><strong>" . __('Upload date:') . "</strong> " . mysql2date( get_option('date_format'), $post->post_date ). '</p>';
+                       if ( !empty( $media_dims ) )
+                               $item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";
+
+                       $item .= "</td></tr>\n";
+
+       $item .= "
                </thead>
-               <tbody>\n";
+               <tbody>
+               <tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>
+               <tr><td style='display:none' colspan='2' class='image-editor' id='image-editor-$post->ID'></td></tr>\n";
 
        $defaults = array(
                'input'      => 'text',
@@ -672,26 +1224,52 @@ function get_media_item( $attachment_id, $args = null ) {
                'extra_rows' => array(),
        );
 
-       $delete_href = wp_nonce_url("post.php?action=delete-post&amp;post=$attachment_id", 'delete-post_' . $attachment_id);
        if ( $send )
-               $send = "<input type='submit' class='button' name='send[$attachment_id]' value='" . attribute_escape( __( 'Insert into Post' ) ) . "' />";
-       if ( $delete )
-               $delete = "<a href='$delete_href' id='del[$attachment_id]' disabled='disabled' class='delete'>" . __('Delete') . "</button>";
-       if ( ( $send || $delete ) && !isset($form_fields['buttons']) )
-               $form_fields['buttons'] = array('tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>$send $delete</td></tr>\n");
+               $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
+       if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
+               if ( !EMPTY_TRASH_DAYS ) {
+                       $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete-permanently'>" . __( 'Delete Permanently' ) . '</a>';
+               } elseif ( !MEDIA_TRASH ) {
+                       $delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
+                        <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'><p>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "</p>
+                        <a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
+                        <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
+                        </div>";
+               } else {
+                       $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
+                       <a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
+               }
+       } else {
+               $delete = '';
+       }
+
+       $thumbnail = '';
+       $calling_post_id = 0;
+       if ( isset( $_GET['post_id'] ) )
+               $calling_post_id = absint( $_GET['post_id'] );
+       elseif ( isset( $_POST ) && count( $_POST ) ) // Like for async-upload where $_GET['post_id'] isn't set
+               $calling_post_id = $post->post_parent;
+       if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) )
+               && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
+               $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" );
+               $thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html__( "Use as featured image" ) . "</a>";
+       }
+
+       if ( ( $send || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) )
+               $form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>$send $thumbnail $delete</td></tr>\n" );
 
        $hidden_fields = array();
 
        foreach ( $form_fields as $id => $field ) {
-               if ( $id{0} == '_' )
+               if ( $id[0] == '_' )
                        continue;
 
-               if ( !empty($field['tr']) ) {
+               if ( !empty( $field['tr'] ) ) {
                        $item .= $field['tr'];
                        continue;
                }
 
-               $field = array_merge($defaults, $field);
+               $field = array_merge( $defaults, $field );
                $name = "attachments[$attachment_id][$id]";
 
                if ( $field['input'] == 'hidden' ) {
@@ -699,29 +1277,35 @@ function get_media_item( $attachment_id, $args = null ) {
                        continue;
                }
 
-               $required = $field['required'] ? '<abbr title="required" class="required">*</abbr>' : '';
+               $required      = $field['required'] ? '<span class="alignright"><abbr title="required" class="required">*</abbr></span>' : '';
+               $aria_required = $field['required'] ? " aria-required='true' " : '';
                $class  = $id;
                $class .= $field['required'] ? ' form-required' : '';
 
-               $item .= "\t\t<tr class='$class'>\n\t\t\t<th valign='top' scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}</span><span class='alignright'>$required</span><br class='clear' /></label></th>\n\t\t\t<td class='field'>";
-               if ( !empty($field[$field['input']]) )
-                       $item .= $field[$field['input']];
+               $item .= "\t\t<tr class='$class'>\n\t\t\t<th valign='top' scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label></th>\n\t\t\t<td class='field'>";
+               if ( !empty( $field[ $field['input'] ] ) )
+                       $item .= $field[ $field['input'] ];
                elseif ( $field['input'] == 'textarea' ) {
-                       $item .= "<textarea type='text' id='$name' name='$name'>" . attribute_escape( $field['value'] ) . "</textarea>";
+                       if ( 'post_content' == $id && user_can_richedit() ) {
+                               // sanitize_post() skips the post_content when user_can_richedit
+                               $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
+                       }
+                       // post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit()
+                       $item .= "<textarea id='$name' name='$name' $aria_required>" . $field['value'] . '</textarea>';
                } else {
-                       $item .= "<input type='text' id='$name' name='$name' value='" . attribute_escape( $field['value'] ) . "' />";
+                       $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
                }
-               if ( !empty($field['helps']) )
-                       $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique((array) $field['helps']) ) . '</p>';
+               if ( !empty( $field['helps'] ) )
+                       $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
                $item .= "</td>\n\t\t</tr>\n";
 
                $extra_rows = array();
 
-               if ( !empty($field['errors']) )
-                       foreach ( array_unique((array) $field['errors']) as $error )
+               if ( !empty( $field['errors'] ) )
+                       foreach ( array_unique( (array) $field['errors'] ) as $error )
                                $extra_rows['error'][] = $error;
 
-               if ( !empty($field['extra_rows']) )
+               if ( !empty( $field['extra_rows'] ) )
                        foreach ( $field['extra_rows'] as $class => $rows )
                                foreach ( (array) $rows as $html )
                                        $extra_rows[$class][] = $html;
@@ -731,126 +1315,355 @@ function get_media_item( $attachment_id, $args = null ) {
                                $item .= "\t\t<tr><td></td><td class='$class'>$html</td></tr>\n";
        }
 
-       if ( !empty($form_fields['_final']) )
+       if ( !empty( $form_fields['_final'] ) )
                $item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
        $item .= "\t</tbody>\n";
        $item .= "\t</table>\n";
 
        foreach ( $hidden_fields as $name => $value )
-               $item .= "\t<input type='hidden' name='$name' id='$name' value='" . attribute_escape( $value ) . "' />\n";
+               $item .= "\t<input type='hidden' name='$name' id='$name' value='" . esc_attr( $value ) . "' />\n";
+
+       if ( $post->post_parent < 1 && isset( $_REQUEST['post_id'] ) ) {
+               $parent = (int) $_REQUEST['post_id'];
+               $parent_name = "attachments[$attachment_id][post_parent]";
+               $item .= "\t<input type='hidden' name='$parent_name' id='$parent_name' value='$parent' />\n";
+       }
 
        return $item;
 }
 
+function get_compat_media_markup( $attachment_id, $args = null ) {
+       $post = get_post( $attachment_id );
+
+       $default_args = array(
+               'errors' => null,
+               'in_modal' => false,
+       );
+
+       $user_can_edit = current_user_can( 'edit_post', $attachment_id );
+
+       $args = wp_parse_args( $args, $default_args );
+       $args = apply_filters( 'get_media_item_args', $args );
+
+       $form_fields = array();
+
+       if ( $args['in_modal'] ) {
+               foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
+                       $t = (array) get_taxonomy($taxonomy);
+                       if ( ! $t['public'] || ! $t['show_ui'] )
+                               continue;
+                       if ( empty($t['label']) )
+                               $t['label'] = $taxonomy;
+                       if ( empty($t['args']) )
+                               $t['args'] = array();
+
+                       $terms = get_object_term_cache($post->ID, $taxonomy);
+                       if ( false === $terms )
+                               $terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
+
+                       $values = array();
+
+                       foreach ( $terms as $term )
+                               $values[] = $term->slug;
+                       $t['value'] = join(', ', $values);
+                       $t['taxonomy'] = true;
+
+                       $form_fields[$taxonomy] = $t;
+               }
+       }
+
+       // Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
+       // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing )
+       $form_fields = array_merge_recursive($form_fields, (array) $args['errors'] );
+
+       $form_fields = apply_filters( 'attachment_fields_to_edit', $form_fields, $post );
+
+       unset( $form_fields['image-size'], $form_fields['align'], $form_fields['image_alt'],
+               $form_fields['post_title'], $form_fields['post_excerpt'], $form_fields['post_content'],
+               $form_fields['url'], $form_fields['menu_order'], $form_fields['image_url'] );
+
+       $media_meta = apply_filters( 'media_meta', '', $post );
+
+       $defaults = array(
+               'input'         => 'text',
+               'required'      => false,
+               'value'         => '',
+               'extra_rows'    => array(),
+               'show_in_edit'  => true,
+               'show_in_modal' => true,
+       );
+
+       $hidden_fields = array();
+
+       $item = '';
+       foreach ( $form_fields as $id => $field ) {
+               if ( $id[0] == '_' )
+                       continue;
+
+               $name = "attachments[$attachment_id][$id]";
+               $id_attr = "attachments-$attachment_id-$id";
+
+               if ( !empty( $field['tr'] ) ) {
+                       $item .= $field['tr'];
+                       continue;
+               }
+
+               $field = array_merge( $defaults, $field );
+
+               if ( ( ! $field['show_in_edit'] && ! $args['in_modal'] ) || ( ! $field['show_in_modal'] && $args['in_modal'] ) )
+                       continue;
+
+               if ( $field['input'] == 'hidden' ) {
+                       $hidden_fields[$name] = $field['value'];
+                       continue;
+               }
+
+               $readonly      = ! $user_can_edit && ! empty( $field['taxonomy'] ) ? " readonly='readonly' " : '';
+               $required      = $field['required'] ? '<span class="alignright"><abbr title="required" class="required">*</abbr></span>' : '';
+               $aria_required = $field['required'] ? " aria-required='true' " : '';
+               $class  = 'compat-field-' . $id;
+               $class .= $field['required'] ? ' form-required' : '';
+
+               $item .= "\t\t<tr class='$class'>";
+               $item .= "\t\t\t<th valign='top' scope='row' class='label'><label for='$id_attr'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label>";
+               $item .= "</th>\n\t\t\t<td class='field'>";
+
+               if ( !empty( $field[ $field['input'] ] ) )
+                       $item .= $field[ $field['input'] ];
+               elseif ( $field['input'] == 'textarea' ) {
+                       if ( 'post_content' == $id && user_can_richedit() ) {
+                               // sanitize_post() skips the post_content when user_can_richedit
+                               $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
+                       }
+                       $item .= "<textarea id='$id_attr' name='$name' $aria_required>" . $field['value'] . '</textarea>';
+               } else {
+                       $item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly $aria_required />";
+               }
+               if ( !empty( $field['helps'] ) )
+                       $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
+               $item .= "</td>\n\t\t</tr>\n";
+
+               $extra_rows = array();
+
+               if ( !empty( $field['errors'] ) )
+                       foreach ( array_unique( (array) $field['errors'] ) as $error )
+                               $extra_rows['error'][] = $error;
+
+               if ( !empty( $field['extra_rows'] ) )
+                       foreach ( $field['extra_rows'] as $class => $rows )
+                               foreach ( (array) $rows as $html )
+                                       $extra_rows[$class][] = $html;
+
+               foreach ( $extra_rows as $class => $rows )
+                       foreach ( $rows as $html )
+                               $item .= "\t\t<tr><td></td><td class='$class'>$html</td></tr>\n";
+       }
+
+       if ( !empty( $form_fields['_final'] ) )
+               $item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
+       if ( $item )
+               $item = '<table class="compat-attachment-fields">' . $item . '</table>';
+
+       foreach ( $hidden_fields as $hidden_field => $value ) {
+               $item .= '<input type="hidden" name="' . esc_attr( $hidden_field ) . '" value="' . esc_attr( $value ) . '" />' . "\n";
+       }
+
+       if ( $item )
+               $item = '<input type="hidden" name="attachments[' . $attachment_id . '][menu_order]" value="' . esc_attr( $post->menu_order ) . '" />' . $item;
+
+       return array(
+               'item'   => $item,
+               'meta'   => $media_meta,
+       );
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ */
 function media_upload_header() {
-       ?>
-       <script type="text/javascript">post_id = <?php echo intval($_REQUEST['post_id']); ?>;</script>
-       <div id="media-upload-header">
-       <?php the_media_upload_tabs(); ?>
-       </div>
-       <?php
+       $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
+       echo '<script type="text/javascript">post_id = ' . $post_id . ";</script>\n";
+       if ( empty( $_GET['chromeless'] ) ) {
+               echo '<div id="media-upload-header">';
+               the_media_upload_tabs();
+               echo '</div>';
+       }
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @param unknown_type $errors
+ */
 function media_upload_form( $errors = null ) {
-       global $type, $tab;
+       global $type, $tab, $is_IE, $is_opera;
 
-       $flash_action_url = get_option('siteurl') . "/wp-admin/async-upload.php";
+       if ( ! _device_can_upload() ) {
+               echo '<p>' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'http://wordpress.org/mobile/' ) . '</p>';
+               return;
+       }
 
-       // If Mac and mod_security, no Flash. :(
-       $flash = true;
-       if ( false !== strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'mac') && apache_mod_loaded('mod_security') )
-               $flash = false;
+       $upload_action_url = admin_url('async-upload.php');
+       $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
+       $_type = isset($type) ? $type : '';
+       $_tab = isset($tab) ? $tab : '';
 
-       $flash = apply_filters('flash_uploader', $flash);
-       $post_id = intval($_REQUEST['post_id']);
+       $upload_size_unit = $max_upload_size = wp_max_upload_size();
+       $sizes = array( 'KB', 'MB', 'GB' );
 
+       for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) {
+               $upload_size_unit /= 1024;
+       }
+
+       if ( $u < 0 ) {
+               $upload_size_unit = 0;
+               $u = 0;
+       } else {
+               $upload_size_unit = (int) $upload_size_unit;
+       }
 ?>
-<input type='hidden' name='post_id' value='<?php echo (int) $post_id; ?>' />
-<div id="media-upload-notice">
-<?php if (isset($errors['upload_notice']) ) { ?>
-       <?php echo $errors['upload_notice']; ?>
-<?php } ?>
-</div>
-<div id="media-upload-error">
-<?php if (isset($errors['upload_error']) && is_wp_error($errors['upload_error'])) { ?>
-       <?php echo $errors['upload_error']->get_error_message(); ?>
-<?php } ?>
-</div>
-<?php if ( $flash ) : ?>
+
+<div id="media-upload-notice"><?php
+
+       if (isset($errors['upload_notice']) )
+               echo $errors['upload_notice'];
+
+?></div>
+<div id="media-upload-error"><?php
+
+       if (isset($errors['upload_error']) && is_wp_error($errors['upload_error']))
+               echo $errors['upload_error']->get_error_message();
+
+?></div>
+<?php
+if ( is_multisite() && !is_upload_space_available() ) {
+       do_action( 'upload_ui_over_quota' );
+       return;
+}
+
+do_action('pre-upload-ui');
+
+$post_params = array(
+               "post_id" => $post_id,
+               "_wpnonce" => wp_create_nonce('media-form'),
+               "type" => $_type,
+               "tab" => $_tab,
+               "short" => "1",
+);
+
+$post_params = apply_filters( 'upload_post_params', $post_params ); // hook change! old name: 'swfupload_post_params'
+
+$plupload_init = array(
+       'runtimes' => 'html5,silverlight,flash,html4',
+       'browse_button' => 'plupload-browse-button',
+       'container' => 'plupload-upload-ui',
+       'drop_element' => 'drag-drop-area',
+       'file_data_name' => 'async-upload',
+       'multiple_queues' => true,
+       'max_file_size' => $max_upload_size . 'b',
+       'url' => $upload_action_url,
+       'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
+       'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
+       'filters' => array( array('title' => __( 'Allowed Files' ), 'extensions' => '*') ),
+       'multipart' => true,
+       'urlstream_upload' => true,
+       'multipart_params' => $post_params
+);
+
+// Multi-file uploading doesn't currently work in iOS Safari,
+// single-file allows the built-in camera to be used as source for images
+if ( wp_is_mobile() )
+       $plupload_init['multi_selection'] = false;
+
+$plupload_init = apply_filters( 'plupload_init', $plupload_init );
+
+?>
+
 <script type="text/javascript">
-<!--
-jQuery(function($){
-       swfu = new SWFUpload({
-                       upload_url : "<?php echo attribute_escape( $flash_action_url ); ?>",
-                       flash_url : "<?php echo get_option('siteurl').'/wp-includes/js/swfupload/swfupload_f9.swf'; ?>",
-                       file_post_name: "async-upload",
-                       file_types: "<?php echo apply_filters('upload_file_glob', '*.*'); ?>",
-                       post_params : {
-                               "post_id" : "<?php echo $post_id; ?>",
-                               "auth_cookie" : "<?php echo $_COOKIE[AUTH_COOKIE]; ?>",
-                               "type" : "<?php echo $type; ?>",
-                               "tab" : "<?php echo $tab; ?>",
-                               "short" : "1"
-                       },
-                       file_size_limit : "<?php echo wp_max_upload_size(); ?>b",
-                       swfupload_element_id : "flash-upload-ui", // id of the element displayed when swfupload is available
-                       degraded_element_id : "html-upload-ui",   // when swfupload is unavailable
-                       file_dialog_start_handler : fileDialogStart,
-                       file_queued_handler : fileQueued,
-                       upload_start_handler : uploadStart,
-                       upload_progress_handler : uploadProgress,
-                       upload_error_handler : uploadError,
-                       upload_success_handler : uploadSuccess,
-                       upload_complete_handler : uploadComplete,
-                       file_queue_error_handler : fileQueueError,
-                       file_dialog_complete_handler : fileDialogComplete,
-
-                       debug: false
-               });
-       $("#flash-browse-button").bind( "click", function(){swfu.selectFiles();});
-});
-//-->
+<?php
+// Verify size is an int. If not return default value.
+$large_size_h = absint( get_option('large_size_h') );
+if( !$large_size_h )
+       $large_size_h = 1024;
+$large_size_w = absint( get_option('large_size_w') );
+if( !$large_size_w )
+       $large_size_w = 1024;
+?>
+var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
+wpUploaderInit = <?php echo json_encode($plupload_init); ?>;
 </script>
 
-
-<div id="flash-upload-ui">
-       <p><input id="flash-browse-button" type="button" value="<?php echo attribute_escape( __( 'Choose files to upload' ) ); ?>" class="button" /></p>
-       <p><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
+<div id="plupload-upload-ui" class="hide-if-no-js">
+<?php do_action('pre-plupload-upload-ui'); // hook change, old name: 'pre-flash-upload-ui' ?>
+<div id="drag-drop-area">
+       <div class="drag-drop-inside">
+       <p class="drag-drop-info"><?php _e('Drop files here'); ?></p>
+       <p><?php _ex('or', 'Uploader: Drop files here - or - Select Files'); ?></p>
+       <p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e('Select Files'); ?>" class="button" /></p>
+       </div>
+</div>
+<?php do_action('post-plupload-upload-ui'); // hook change, old name: 'post-flash-upload-ui' ?>
 </div>
 
-<?php endif; // $flash ?>
-
-<div id="html-upload-ui">
-       <p>
-       <input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php echo attribute_escape(__('Upload')); ?>" /> <a href="#" onClick="return top.tb_remove();"><?php _e('Cancel'); ?></a>
+<div id="html-upload-ui" class="hide-if-js">
+<?php do_action('pre-html-upload-ui'); ?>
+       <p id="async-upload-wrap">
+               <label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
+               <input type="file" name="async-upload" id="async-upload" />
+               <?php submit_button( __( 'Upload' ), 'button', 'html-upload', false ); ?>
+               <a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
        </p>
-       <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-       <br class="clear" />
-       <?php if ( is_lighttpd_before_150() ): ?>
-       <p><?php _e('If you want to use all capabilities of the uploader, like uploading multiple files at once, please upgrade to lighttpd 1.5.'); ?></p>
-       <?php endif;?>
+       <div class="clear"></div>
+<?php do_action('post-html-upload-ui'); ?>
 </div>
+
+<span class="max-upload-size"><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?></span>
 <?php
+if ( ($is_IE || $is_opera) && $max_upload_size > 100 * 1024 * 1024 ) { ?>
+       <span class="big-file-warning"><?php _e('Your browser has some limitations uploading large files with the multi-file uploader. Please use the browser uploader for files over 100MB.'); ?></span>
+<?php }
+
+       do_action('post-upload-ui');
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @param string $type
+ * @param object $errors
+ * @param integer $id
+ */
 function media_upload_type_form($type = 'file', $errors = null, $id = null) {
+
        media_upload_header();
 
-       $post_id = intval($_REQUEST['post_id']);
+       $post_id = isset( $_REQUEST['post_id'] )? intval( $_REQUEST['post_id'] ) : 0;
 
-       $form_action_url = get_option('siteurl') . "/wp-admin/media-upload.php?type=$type&tab=type&post_id=$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);
+       $form_class = 'media-upload-form type-form validate';
 
-       $callback = "type_form_$type";
+       if ( get_user_setting('uploader') )
+               $form_class .= ' html-uploader';
 ?>
 
-<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
+<?php submit_button( '', 'hidden', 'save', false ); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <?php wp_nonce_field('media-form'); ?>
-<h3><?php _e('From Computer'); ?></h3>
+
+<h3 class="media-title"><?php _e('Add media files from your computer'); ?></h3>
+
 <?php media_upload_form( $errors ); ?>
 
 <script type="text/javascript">
-<!--
+//<![CDATA[
 jQuery(function($){
        var preloaded = $(".media-item.preloaded");
        if ( preloaded.length > 0 ) {
@@ -858,38 +1671,180 @@ jQuery(function($){
        }
        updateMediaForm();
 });
--->
+//]]>
 </script>
-<?php if ( $id && !is_wp_error($id) ) : ?>
-<div id="media-items">
-<?php echo get_media_items( $id, $errors ); ?>
-</div>
-<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
+<div id="media-items"><?php
 
-<?php elseif ( is_callable($callback) ) : ?>
+if ( $id ) {
+       if ( !is_wp_error($id) ) {
+               add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
+               echo get_media_items( $id, $errors );
+       } else {
+               echo '<div id="media-upload-error">'.esc_html($id->get_error_message()).'</div></div>';
+               exit;
+       }
+}
+?></div>
 
-<div class="media-blank">
-<p style="text-align:center"><?php _e('&mdash; OR &mdash;'); ?></p>
-<h3><?php _e('From URL'); ?></h3>
-</div>
+<p class="savebutton ml-submit">
+<?php submit_button( __( 'Save all changes' ), 'button', 'save', false ); ?>
+</p>
+</form>
+<?php
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.7.0
+ *
+ * @param string $type
+ * @param object $errors
+ * @param integer $id
+ */
+function media_upload_type_url_form($type = null, $errors = null, $id = null) {
+       if ( null === $type )
+               $type = 'image';
+
+       media_upload_header();
+
+       $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
+
+       $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);
+       $form_class = 'media-upload-form type-form validate';
+
+       if ( get_user_setting('uploader') )
+               $form_class .= ' html-uploader';
+?>
+
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
+<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+<?php wp_nonce_field('media-form'); ?>
+
+<h3 class="media-title"><?php _e('Insert media from another website'); ?></h3>
+
+<script type="text/javascript">
+//<![CDATA[
+var addExtImage = {
+
+       width : '',
+       height : '',
+       align : 'alignnone',
+
+       insert : function() {
+               var t = this, html, f = document.forms[0], cls, title = '', alt = '', caption = '';
+
+               if ( '' == f.src.value || '' == t.width )
+                       return false;
+
+               if ( f.alt.value )
+                       alt = f.alt.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+
+<?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>
+               if ( f.caption.value ) {
+                       caption = f.caption.value.replace(/\r\n|\r/g, '\n');
+                       caption = caption.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(a){
+                               return a.replace(/[\r\n\t]+/, ' ');
+                       });
+
+                       caption = caption.replace(/\s*\n\s*/g, '<br />');
+               }
+<?php } ?>
+
+               cls = caption ? '' : ' class="'+t.align+'"';
+
+               html = '<img alt="'+alt+'" src="'+f.src.value+'"'+cls+' width="'+t.width+'" height="'+t.height+'" />';
+
+               if ( f.url.value ) {
+                       url = f.url.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+                       html = '<a href="'+url+'">'+html+'</a>';
+               }
+
+               if ( caption )
+                       html = '[caption id="" align="'+t.align+'" width="'+t.width+'"]'+html+caption+'[/caption]';
+
+               var win = window.dialogArguments || opener || parent || top;
+               win.send_to_editor(html);
+               return false;
+       },
+
+       resetImageData : function() {
+               var t = addExtImage;
+
+               t.width = t.height = '';
+               document.getElementById('go_button').style.color = '#bbb';
+               if ( ! document.forms[0].src.value )
+                       document.getElementById('status_img').innerHTML = '*';
+               else document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/no.png' ) ); ?>" alt="" />';
+       },
+
+       updateImageData : function() {
+               var t = addExtImage;
+
+               t.width = t.preloadImg.width;
+               t.height = t.preloadImg.height;
+               document.getElementById('go_button').style.color = '#333';
+               document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/yes.png' ) ); ?>" alt="" />';
+       },
+
+       getImageData : function() {
+               if ( jQuery('table.describe').hasClass('not-image') )
+                       return;
+
+               var t = addExtImage, src = document.forms[0].src.value;
+
+               if ( ! src ) {
+                       t.resetImageData();
+                       return false;
+               }
+
+               document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" width="16" />';
+               t.preloadImg = new Image();
+               t.preloadImg.onload = t.updateImageData;
+               t.preloadImg.onerror = t.resetImageData;
+               t.preloadImg.src = src;
+       }
+}
+
+jQuery(document).ready( function($) {
+       $('.media-types input').click( function() {
+               $('table.describe').toggleClass('not-image', $('#not-image').prop('checked') );
+       });
+});
+
+//]]>
+</script>
 
 <div id="media-items">
 <div class="media-item media-blank">
-<?php echo call_user_func($callback); ?>
+<?php echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) ); ?>
 </div>
 </div>
-<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
+</form>
 <?php
-       endif;
 }
 
+/**
+ * Adds gallery form to upload iframe
+ *
+ * @since 2.5.0
+ *
+ * @param array $errors
+ */
 function media_upload_gallery_form($errors) {
+       global $redir_tab, $type;
+
+       $redir_tab = 'gallery';
        media_upload_header();
 
        $post_id = intval($_REQUEST['post_id']);
+       $form_action_url = admin_url("media-upload.php?type=$type&tab=gallery&post_id=$post_id");
+       $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
+       $form_class = 'media-upload-form validate';
 
-       $form_action_url = get_option('siteurl') . "/wp-admin/media-upload.php?type={$GLOBALS['type']}&tab=gallery&post_id=$post_id";
-
+       if ( get_user_setting('uploader') )
+               $form_class .= ' html-uploader';
 ?>
 
 <script type="text/javascript">
@@ -903,56 +1858,165 @@ jQuery(function($){
 });
 -->
 </script>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form validate" id="gallery-form">
+<div id="sort-buttons" class="hide-if-no-js">
+<span>
+<?php _e('All Tabs:'); ?>
+<a href="#" id="showall"><?php _e('Show'); ?></a>
+<a href="#" id="hideall" style="display:none;"><?php _e('Hide'); ?></a>
+</span>
+<?php _e('Sort Order:'); ?>
+<a href="#" id="asc"><?php _e('Ascending'); ?></a> |
+<a href="#" id="desc"><?php _e('Descending'); ?></a> |
+<a href="#" id="clear"><?php _ex('Clear', 'verb'); ?></a>
+</div>
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>
-
+<table class="widefat" cellspacing="0">
+<thead><tr>
+<th><?php _e('Media'); ?></th>
+<th class="order-head"><?php _e('Order'); ?></th>
+<th class="actions-head"><?php _e('Actions'); ?></th>
+</tr></thead>
+</table>
 <div id="media-items">
+<?php add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2); ?>
 <?php echo get_media_items($post_id, $errors); ?>
 </div>
-<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
-<input type="submit" class="button insert-gallery" name="insert-gallery" value="<?php echo attribute_escape( __( 'Insert gallery into post' ) ); ?>" />
+
+<p class="ml-submit">
+<?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false, array( 'id' => 'save-all', 'style' => 'display: none;' ) ); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="type" value="<?php echo attribute_escape( $GLOBALS['type'] ); ?>" />
-<input type="hidden" name="tab" value="<?php echo attribute_escape( $GLOBALS['tab'] ); ?>" />
+<input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
+<input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
+</p>
+
+<div id="gallery-settings" style="display:none;">
+<div class="title"><?php _e('Gallery Settings'); ?></div>
+<table id="basic" class="describe"><tbody>
+       <tr>
+       <th scope="row" class="label">
+               <label>
+               <span class="alignleft"><?php _e('Link thumbnails to:'); ?></span>
+               </label>
+       </th>
+       <td class="field">
+               <input type="radio" name="linkto" id="linkto-file" value="file" />
+               <label for="linkto-file" class="radio"><?php _e('Image File'); ?></label>
+
+               <input type="radio" checked="checked" name="linkto" id="linkto-post" value="post" />
+               <label for="linkto-post" class="radio"><?php _e('Attachment Page'); ?></label>
+       </td>
+       </tr>
+
+       <tr>
+       <th scope="row" class="label">
+               <label>
+               <span class="alignleft"><?php _e('Order images by:'); ?></span>
+               </label>
+       </th>
+       <td class="field">
+               <select id="orderby" name="orderby">
+                       <option value="menu_order" selected="selected"><?php _e('Menu order'); ?></option>
+                       <option value="title"><?php _e('Title'); ?></option>
+                       <option value="post_date"><?php _e('Date/Time'); ?></option>
+                       <option value="rand"><?php _e('Random'); ?></option>
+               </select>
+       </td>
+       </tr>
+
+       <tr>
+       <th scope="row" class="label">
+               <label>
+               <span class="alignleft"><?php _e('Order:'); ?></span>
+               </label>
+       </th>
+       <td class="field">
+               <input type="radio" checked="checked" name="order" id="order-asc" value="asc" />
+               <label for="order-asc" class="radio"><?php _e('Ascending'); ?></label>
+
+               <input type="radio" name="order" id="order-desc" value="desc" />
+               <label for="order-desc" class="radio"><?php _e('Descending'); ?></label>
+       </td>
+       </tr>
+
+       <tr>
+       <th scope="row" class="label">
+               <label>
+               <span class="alignleft"><?php _e('Gallery columns:'); ?></span>
+               </label>
+       </th>
+       <td class="field">
+               <select id="columns" name="columns">
+                       <option value="1">1</option>
+                       <option value="2">2</option>
+                       <option value="3" selected="selected">3</option>
+                       <option value="4">4</option>
+                       <option value="5">5</option>
+                       <option value="6">6</option>
+                       <option value="7">7</option>
+                       <option value="8">8</option>
+                       <option value="9">9</option>
+               </select>
+       </td>
+       </tr>
+</tbody></table>
+
+<p class="ml-submit">
+<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e( 'Insert gallery' ); ?>" />
+<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e( 'Update gallery settings' ); ?>" />
+</p>
+</div>
 </form>
 <?php
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.0
+ *
+ * @param array $errors
+ */
 function media_upload_library_form($errors) {
        global $wpdb, $wp_query, $wp_locale, $type, $tab, $post_mime_types;
 
        media_upload_header();
 
-       $post_id = intval($_REQUEST['post_id']);
+       $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
+
+       $form_action_url = admin_url("media-upload.php?type=$type&tab=library&post_id=$post_id");
+       $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
+       $form_class = 'media-upload-form validate';
 
-       $form_action_url = get_option('siteurl') . "/wp-admin/media-upload.php?type={$GLOBALS['type']}&tab=library&post_id=$post_id";
+       if ( get_user_setting('uploader') )
+               $form_class .= ' html-uploader';
 
-       $_GET['paged'] = intval($_GET['paged']);
+       $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
        if ( $_GET['paged'] < 1 )
                $_GET['paged'] = 1;
        $start = ( $_GET['paged'] - 1 ) * 10;
        if ( $start < 1 )
                $start = 0;
-       add_filter( 'post_limits', $limit_filter = create_function( '$a', "return 'LIMIT $start, 10';" ) );
+       add_filter( 'post_limits', create_function( '$a', "return 'LIMIT $start, 10';" ) );
 
        list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
 
 ?>
 
 <form id="filter" action="" method="get">
-<input type="hidden" name="type" value="<?php echo attribute_escape( $type ); ?>" />
-<input type="hidden" name="tab" value="<?php echo attribute_escape( $tab ); ?>" />
+<input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
+<input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
 <input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="post_mime_type" value="<?php echo attribute_escape( $_GET['post_mime_type'] ); ?>" />
+<input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? esc_attr( $_GET['post_mime_type'] ) : ''; ?>" />
+<input type="hidden" name="context" value="<?php echo isset( $_GET['context'] ) ? esc_attr( $_GET['context'] ) : ''; ?>" />
 
-<div id="search-filter">
-       <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
-       <input type="submit" value="<?php echo attribute_escape( __( 'Search Media' ) ); ?>" class="button" />
-</div>
+<p id="media-search" class="search-box">
+       <label class="screen-reader-text" for="media-search-input"><?php _e('Search Media');?>:</label>
+       <input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
+       <?php submit_button( __( 'Search Media' ), 'button', '', false ); ?>
+</p>
 
-<p>
 <ul class="subsubsub">
 <?php
 $type_links = array();
@@ -960,7 +2024,10 @@ $_num_posts = (array) wp_count_attachments();
 $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
 foreach ( $matches as $_type => $reals )
        foreach ( $reals as $real )
-               $num_posts[$_type] += $_num_posts[$real];
+               if ( isset($num_posts[$_type]) )
+                       $num_posts[$_type] += $_num_posts[$real];
+               else
+                       $num_posts[$_type] = $_num_posts[$real];
 // If available type specified by media button clicked, filter by that type
 if ( empty($_GET['post_mime_type']) && !empty($num_posts[$type]) ) {
        $_GET['post_mime_type'] = $type;
@@ -968,23 +2035,24 @@ if ( empty($_GET['post_mime_type']) && !empty($num_posts[$type]) ) {
 }
 if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' )
        $class = ' class="current"';
-$type_links[] = "<li><a href='" . add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false)) . "'$class>".__('All Types')."</a>";
+else
+       $class = '';
+$type_links[] = "<li><a href='" . esc_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))) . "'$class>".__('All Types')."</a>";
 foreach ( $post_mime_types as $mime_type => $label ) {
        $class = '';
 
        if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
                continue;
 
-       if ( wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
+       if ( isset($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
                $class = ' class="current"';
 
-       $type_links[] = "<li><a href='" . add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false)) . "'$class>" . sprintf(__ngettext($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
+       $type_links[] = "<li><a href='" . esc_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
 }
-echo implode(' | </li>', $type_links) . '</li>';
+echo implode(' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
 unset($type_links);
 ?>
 </ul>
-</p>
 
 <div class="tablenav">
 
@@ -992,6 +2060,8 @@ unset($type_links);
 $page_links = paginate_links( array(
        'base' => add_query_arg( 'paged', '%#%' ),
        'format' => '',
+       'prev_text' => __('&laquo;'),
+       'next_text' => __('&raquo;'),
        'total' => ceil($wp_query->found_posts / 10),
        'current' => $_GET['paged']
 ));
@@ -1000,7 +2070,7 @@ if ( $page_links )
        echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
 
-<div class="alignleft">
+<div class="alignleft actions">
 <?php
 
 $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
@@ -1008,30 +2078,31 @@ $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmon
 $arc_result = $wpdb->get_results( $arc_query );
 
 $month_count = count($arc_result);
+$selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
 
 if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?>
 <select name='m'>
-<option<?php selected( @$_GET['m'], 0 ); ?> value='0'><?php _e('Show all dates'); ?></option>
+<option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e('Show all dates'); ?></option>
 <?php
 foreach ($arc_result as $arc_row) {
        if ( $arc_row->yyear == 0 )
                continue;
        $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
 
-       if ( $arc_row->yyear . $arc_row->mmonth == $_GET['m'] )
+       if ( $arc_row->yyear . $arc_row->mmonth == $selected_month )
                $default = ' selected="selected"';
        else
                $default = '';
 
-       echo "<option$default value='" . attribute_escape( $arc_row->yyear . $arc_row->mmonth ) . "'>";
-       echo wp_specialchars( $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear" );
+       echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
+       echo esc_html( $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear" );
        echo "</option>\n";
 }
 ?>
 </select>
 <?php } ?>
 
-<input type="submit" id="post-query-submit" value="<?php echo attribute_escape( __( 'Filter &#187;' ) ); ?>" class="button-secondary" />
+<?php submit_button( __( 'Filter &#187;' ), 'button', 'post-query-submit', false ); ?>
 
 </div>
 
@@ -1039,7 +2110,7 @@ foreach ($arc_result as $arc_row) {
 </div>
 </form>
 
-<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form validate" id="library-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">
 
 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>
@@ -1057,154 +2128,581 @@ jQuery(function($){
 </script>
 
 <div id="media-items">
+<?php add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2); ?>
 <?php echo get_media_items(null, $errors); ?>
 </div>
-<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
+<p class="ml-submit">
+<?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false ); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+</p>
 </form>
 <?php
 }
 
-function type_form_image() {
-       return '
-       <table class="describe"><tbody>
-               <tr>
+/**
+ * Creates the form for external url
+ *
+ * @since 2.7.0
+ *
+ * @param string $default_view
+ * @return string the form html
+ */
+function wp_media_insert_url_form( $default_view = 'image' ) {
+       if ( !apply_filters( 'disable_captions', '' ) ) {
+               $caption = '
+               <tr class="image-only">
                        <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[src]">' . __('Image URL') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
+                               <label for="caption"><span class="alignleft">' . __('Image Caption') . '</span></label>
                        </th>
-                       <td class="field"><input id="insertonly[src]" name="insertonly[src]" value="" type="text"></td>
+                       <td class="field"><textarea id="caption" name="caption"></textarea></td>
                </tr>
-               <tr>
-                       <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[alt]">' . __('Description') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
-                       </th>
-                       <td class="field"><input id="insertonly[alt]" name="insertonly[alt]" value="" type="text"></td>
-               </tr>
-               <tr><td></td><td class="help">' . __('Alternate text, e.g. "The Mona Lisa"') . '</td></tr>
-               <tr class="align">
-                       <th valign="top" scope="row" class="label"><label for="insertonly[align]">' . __('Alignment') . '</label></th>
-                       <td class="field">
-                               <input name="insertonly[align]" id="image-align-none-0" value="none" type="radio" checked="checked" />
-                               <label for="image-align-none-0" class="align image-align-none-label">' . __('None') . '</label>
-                               <input name="insertonly[align]" id="image-align-left-0" value="left" type="radio" />
-                               <label for="image-align-left-0" class="align image-align-left-label">' . __('Left') . '</label>
-                               <input name="insertonly[align]" id="image-align-center-0" value="center" type="radio" />
-                               <label for="image-align-center-0" class="align image-align-center-label">' . __('Center') . '</label>
-                               <input name="insertonly[align]" id="image-align-right-0" value="right" type="radio" />
-                               <label for="image-align-right-0" class="align image-align-right-label">' . __('Right') . '</label>
-                       </td>
-               </tr>
-               <tr>
-                       <td></td>
-                       <td>
-                               <input type="submit" class="button" name="insertonlybutton" value="' . attribute_escape(__('Insert into Post')) . '" />
-                       </td>
-               </tr>
-       </tbody></table>
 ';
-}
+       } else {
+               $caption = '';
+       }
+
+       $default_align = get_option('image_default_align');
+       if ( empty($default_align) )
+               $default_align = 'none';
+
+       if ( 'image' == $default_view ) {
+               $view = 'image-only';
+               $table_class = '';
+       } else {
+               $view = $table_class = 'not-image';
+       }
 
-function type_form_audio() {
        return '
-       <table class="describe"><tbody>
+       <p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked( 'image-only', $view, false ) . ' /> ' . __( 'Image' ) . '</label> &nbsp; &nbsp; <label><input type="radio" name="media_type" value="generic" id="not-image"' . checked( 'not-image', $view, false ) . ' /> ' . __( 'Audio, Video, or Other File' ) . '</label></p>
+       <table class="describe ' . $table_class . '"><tbody>
                <tr>
-                       <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[href]">' . __('Audio File URL') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
+                       <th valign="top" scope="row" class="label" style="width:130px;">
+                               <label for="src"><span class="alignleft">' . __('URL') . '</span></label>
+                               <span class="alignright"><abbr id="status_img" title="required" class="required">*</abbr></span>
                        </th>
-                       <td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text"></td>
+                       <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td>
                </tr>
-               <tr>
-                       <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
-                       </th>
-                       <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text"></td>
-               </tr>
-               <tr><td></td><td class="help">' . __('Link text, e.g. "Still Alive by Jonathan Coulton"') . '</td></tr>
-               <tr>
-                       <td></td>
-                       <td>
-                               <input type="submit" class="button" name="insertonlybutton" value="' . attribute_escape(__('Insert into Post')) . '" />
-                       </td>
-               </tr>
-       </tbody></table>
-';
-}
 
-function type_form_video() {
-       return '
-       <table class="describe"><tbody>
                <tr>
                        <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[href]">' . __('Video URL') . '</label></span>
+                               <label for="title"><span class="alignleft">' . __('Title') . '</span></label>
                                <span class="alignright"><abbr title="required" class="required">*</abbr></span>
                        </th>
-                       <td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text"></td>
+                       <td class="field"><input id="title" name="title" value="" type="text" aria-required="true" /></td>
                </tr>
-               <tr>
+
+               <tr class="not-image"><td></td><td><p class="help">' . __('Link text, e.g. &#8220;Ransom Demands (PDF)&#8221;') . '</p></td></tr>
+
+               <tr class="image-only">
                        <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
+                               <label for="alt"><span class="alignleft">' . __('Alternative Text') . '</span></label>
                        </th>
-                       <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text"></td>
+                       <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
+                       <p class="help">' . __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;') . '</p></td>
                </tr>
-               <tr><td></td><td class="help">' . __('Link text, e.g. "Lucy on YouTube"') . '</td></tr>
-               <tr>
-                       <td></td>
-                       <td>
-                               <input type="submit" class="button" name="insertonlybutton" value="' . attribute_escape(__('Insert into Post')) . '" />
+               ' . $caption . '
+               <tr class="align image-only">
+                       <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
+                       <td class="field">
+                               <input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'none' ? ' checked="checked"' : '').' />
+                               <label for="align-none" class="align image-align-none-label">' . __('None') . '</label>
+                               <input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'left' ? ' checked="checked"' : '').' />
+                               <label for="align-left" class="align image-align-left-label">' . __('Left') . '</label>
+                               <input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'center' ? ' checked="checked"' : '').' />
+                               <label for="align-center" class="align image-align-center-label">' . __('Center') . '</label>
+                               <input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'right' ? ' checked="checked"' : '').' />
+                               <label for="align-right" class="align image-align-right-label">' . __('Right') . '</label>
                        </td>
                </tr>
-       </tbody></table>
-';
-}
 
-function type_form_file() {
-       return '
-       <table class="describe"><tbody>
-               <tr>
+               <tr class="image-only">
                        <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[href]">' . __('URL') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
+                               <label for="url"><span class="alignleft">' . __('Link Image To:') . '</span></label>
                        </th>
-                       <td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text"></td>
+                       <td class="field"><input id="url" name="url" value="" type="text" /><br />
+
+                       <button type="button" class="button" value="" onclick="document.forms[0].url.value=null">' . __('None') . '</button>
+                       <button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
+                       <p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
                </tr>
-               <tr>
-                       <th valign="top" scope="row" class="label">
-                               <span class="alignleft"><label for="insertonly[title]">' . __('Title') . '</label></span>
-                               <span class="alignright"><abbr title="required" class="required">*</abbr></span>
-                       </th>
-                       <td class="field"><input id="insertonly[title]" name="insertonly[title]" value="" type="text"></td>
+               <tr class="image-only">
+                       <td></td>
+                       <td>
+                               <input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
+                       </td>
                </tr>
-               <tr><td></td><td class="help">' . __('Link text, e.g. "Ransom Demands (PDF)"') . '</td></tr>
-               <tr>
+               <tr class="not-image">
                        <td></td>
                        <td>
-                               <input type="submit" class="button" name="insertonlybutton" value="' . attribute_escape(__('Insert into Post')) . '" />
+                               ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . '
                        </td>
                </tr>
        </tbody></table>
 ';
+
+}
+
+/**
+ * Displays the multi-file uploader message.
+ *
+ * @since 2.6.0
+ */
+function media_upload_flash_bypass() {
+       $browser_uploader = admin_url( 'media-new.php?browser-uploader' );
+
+       if ( $post = get_post() )
+               $browser_uploader .= '&amp;post_id=' . intval( $post->ID );
+       elseif ( ! empty( $GLOBALS['post_ID'] ) )
+               $browser_uploader .= '&amp;post_id=' . intval( $GLOBALS['post_ID'] );
+
+       ?>
+       <p class="upload-flash-bypass">
+       <?php printf( __( 'You are using the multi-file uploader. Problems? Try the <a href="%1$s" target="%2$s">browser uploader</a> instead.' ), $browser_uploader, '_blank' ); ?>
+       </p>
+       <?php
+}
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
+
+/**
+ * Displays the browser's built-in uploader message.
+ *
+ * @since 2.6.0
+ */
+function media_upload_html_bypass() {
+       ?>
+       <p class="upload-html-bypass hide-if-no-js">
+       <?php _e('You are using the browser&#8217;s built-in file uploader. The WordPress uploader includes multiple file selection and drag and drop capability. <a href="#">Switch to the multi-file uploader</a>.'); ?>
+       </p>
+       <?php
+}
+add_action('post-html-upload-ui', 'media_upload_html_bypass');
+
+/**
+ * Used to display a "After a file has been uploaded..." help message.
+ *
+ * @since 3.3.0
+ */
+function media_upload_text_after() {}
+
+/**
+ * Displays the checkbox to scale images.
+ *
+ * @since 3.3.0
+ */
+function media_upload_max_image_resize() {
+       $checked = get_user_setting('upload_resize') ? ' checked="true"' : '';
+       $a = $end = '';
+
+       if ( current_user_can( 'manage_options' ) ) {
+               $a = '<a href="' . esc_url( admin_url( 'options-media.php' ) ) . '" target="_blank">';
+               $end = '</a>';
+       }
+?>
+<p class="hide-if-no-js"><label>
+<input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
+<?php
+       /* translators: %1$s is link start tag, %2$s is link end tag, %3$d is width, %4$d is height*/
+       printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d &times; %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
+?>
+</label></p>
+<?php
+}
+
+/**
+ * Displays the out of storage quota message in Multisite.
+ *
+ * @since 3.5.0
+ */
+function multisite_over_quota_message() {
+       echo '<p>' . sprintf( __( 'Sorry, you have used all of your storage quota of %s MB.' ), get_space_allowed() ) . '</p>';
 }
 
-add_filter('async_upload_image', 'get_media_item', 10, 2);
-add_filter('async_upload_audio', 'get_media_item', 10, 2);
-add_filter('async_upload_video', 'get_media_item', 10, 2);
-add_filter('async_upload_file', 'get_media_item', 10, 2);
+/**
+ * Displays the image and editor in the post editor
+ *
+ * @since 3.5.0
+ */
+function edit_form_image_editor( $post ) {
+       $open = isset( $_GET['image-editor'] );
+       if ( $open )
+               require_once ABSPATH . 'wp-admin/includes/image-edit.php';
+
+       $thumb_url = false;
+       if ( $attachment_id = intval( $post->ID ) )
+               $thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
+
+       $filename = esc_html( basename( $post->guid ) );
+       $title = esc_attr( $post->post_title );
+       $alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
+
+       $att_url = wp_get_attachment_url( $post->ID ); ?>
+       <div class="wp_attachment_holder">
+       <?php
+       if ( wp_attachment_is_image( $post->ID ) ) :
+               $image_edit_button = '';
+               if ( wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
+                       $nonce = wp_create_nonce( "image_editor-$post->ID" );
+                       $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
+               }
+       ?>
+
+               <div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
+
+               <div<?php if ( $open ) echo ' style="display:none"'; ?> class="wp_attachment_image" id="media-head-<?php echo $attachment_id; ?>">
+                       <p id="thumbnail-head-<?php echo $attachment_id; ?>"><img class="thumbnail" src="<?php echo set_url_scheme( $thumb_url[0] ); ?>" style="max-width:100%" alt="" /></p>
+                       <p><?php echo $image_edit_button; ?></p>
+               </div>
+               <div<?php if ( ! $open ) echo ' style="display:none"'; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
+                       <?php if ( $open ) wp_image_editor( $attachment_id ); ?>
+               </div>
+       <?php
+       elseif ( $attachment_id && 0 === strpos( $post->post_mime_type, 'audio/' ) ):
+
+               echo wp_audio_shortcode( array( 'src' => $att_url ) );
+
+       elseif ( $attachment_id && 0 === strpos( $post->post_mime_type, 'video/' ) ):
+
+               $meta = wp_get_attachment_metadata( $attachment_id );
+               $w = ! empty( $meta['width'] ) ? min( $meta['width'], 600 ) : 0;
+               $h = 0;
+               if ( ! empty( $meta['height'] ) )
+                       $h = $meta['height'];
+               if ( $h && $w < $meta['width'] )
+                       $h = round( ( $meta['height'] * $w ) / $meta['width'] );
+
+               $attr = array( 'src' => $att_url );
 
-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('admin_head_media_upload_type_form', 'media_admin_css');
+               if ( ! empty( $meta['width' ] ) )
+                       $attr['width'] = $w;
 
-add_filter('media_upload_gallery', 'media_upload_gallery');
-add_action('admin_head_media_upload_gallery_form', 'media_admin_css');
+               if ( ! empty( $meta['height'] ) )
+                       $attr['height'] = $h;
 
-add_filter('media_upload_library', 'media_upload_library');
-add_action('admin_head_media_upload_library_form', 'media_admin_css');
+               echo wp_video_shortcode( $attr );
+
+       endif; ?>
+       </div>
+       <div class="wp_attachment_details edit-form-section">
+               <p>
+                       <label for="attachment_caption"><strong><?php _e( 'Caption' ); ?></strong></label><br />
+                       <textarea class="widefat" name="excerpt" id="attachment_caption"><?php echo $post->post_excerpt; ?></textarea>
+               </p>
+
+       <?php if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) : ?>
+               <p>
+                       <label for="attachment_alt"><strong><?php _e( 'Alternative Text' ); ?></strong></label><br />
+                       <input type="text" class="widefat" name="_wp_attachment_image_alt" id="attachment_alt" value="<?php echo esc_attr( $alt_text ); ?>" />
+               </p>
+       <?php endif; ?>
+
+       <?php
+               $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
+               $editor_args = array(
+                       'textarea_name' => 'content',
+                       'textarea_rows' => 5,
+                       'media_buttons' => false,
+                       'tinymce' => false,
+                       'quicktags' => $quicktags_settings,
+               );
+       ?>
+
+       <label for="content"><strong><?php _e( 'Description' ); ?></strong></label>
+       <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
+
+       </div>
+       <?php
+       $extras = get_compat_media_markup( $post->ID );
+       echo $extras['item'];
+       echo '<input type="hidden" id="image-edit-context" value="edit-attachment" />' . "\n";
+}
 
+/**
+ * Displays non-editable attachment metadata in the publish metabox
+ *
+ * @since 3.5.0
+ */
+function attachment_submitbox_metadata() {
+       $post = get_post();
+
+       $filename = esc_html( wp_basename( $post->guid ) );
+
+       $media_dims = '';
+       $meta = wp_get_attachment_metadata( $post->ID );
+       if ( isset( $meta['width'], $meta['height'] ) )
+               $media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+       $media_dims = apply_filters( 'media_meta', $media_dims, $post );
+
+       $att_url = wp_get_attachment_url( $post->ID );
 ?>
+       <div class="misc-pub-section misc-pub-attachment">
+                       <label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
+                       <input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" value="<?php echo esc_attr($att_url); ?>" />
+       </div>
+       <div class="misc-pub-section misc-pub-filename">
+               <?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
+       </div>
+       <div class="misc-pub-section misc-pub-filetype">
+               <?php _e( 'File type:' ); ?> <strong><?php
+                       if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
+                               echo esc_html( strtoupper( $matches[1] ) );
+                       else
+                               echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
+               ?></strong>
+       </div>
+
+       <?php
+               $file  = get_attached_file( $post->ID );
+               $file_size = false;
+
+               if ( isset( $meta['filesize'] ) )
+                       $file_size = $meta['filesize'];
+               elseif ( file_exists( $file ) )
+                       $file_size = filesize( $file );
+
+               if ( ! empty( $file_size ) ) : ?>
+                       <div class="misc-pub-section misc-pub-filesize">
+                               <?php _e( 'File size:' ); ?> <strong><?php echo size_format( $file_size ); ?></strong>
+                       </div>
+                       <?php
+               endif;
+
+       if ( preg_match( '#^(audio|video)#', $post->post_mime_type ) ):
+
+               /**
+                * Audio and video metadata fields to be shown in the publish meta box.
+                *
+                * The key for each item in the array should correspond to an attachment
+                * metadata key, and the value should be the desired label.
+                *
+                * @since  3.7.0
+                *
+                * @param array $fields {
+                *     An array of the attachment metadata keys and labels.
+                *
+                *     @type string 'mime_type'        Label to be shown before the field mime_type.
+                *     @type string 'year'             Label to be shown before the field year.
+                *     @type string 'genre'            Label to be shown before the field genre.
+                *     @type string 'length_formatted' Label to be shown before the field length_formatted.
+                * }
+                */
+               $fields = apply_filters( 'media_submitbox_misc_sections', array(
+                       'mime_type'        => __( 'Mime-type:' ),
+                       'year'             => __( 'Year:' ),
+                       'genre'            => __( 'Genre:' ),
+                       'length_formatted' => __( 'Length:' ),
+               ) );
+
+               foreach ( $fields as $key => $label ):
+                       if ( ! empty( $meta[$key] ) ) : ?>
+               <div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
+                       <?php echo $label ?> <strong><?php echo esc_html( $meta[$key] ); ?></strong>
+               </div>
+       <?php
+                       endif;
+               endforeach;
+
+               if ( ! empty( $meta['bitrate'] ) ) : ?>
+               <div class="misc-pub-section misc-pub-bitrate">
+                       <?php _e( 'Bitrate:' ); ?> <strong><?php
+                               echo round( $meta['bitrate'] / 1000 ), 'kb/s';
+
+                               if ( ! empty( $meta['bitrate_mode'] ) )
+                                       echo ' ', strtoupper( $meta['bitrate_mode'] );
+
+                       ?></strong>
+               </div>
+       <?php
+               endif;
+
+               /**
+                * Audio attachment metadata fields to be shown in the publish meta box.
+                *
+                * The key for each item in the array should correspond to an attachment
+                * metadata key, and the value should be the desired label.
+                *
+                * @since  3.7.0
+                *
+                * @param array $fields {
+                *     An array of the attachment metadata keys and labels.
+                *
+                *     @type string 'dataformat' Label to be shown before the field dataformat.
+                *     @type string 'codec'      Label to be shown before the field codec.
+                * }
+                */
+               $audio_fields = apply_filters( 'audio_submitbox_misc_sections', array(
+                       'dataformat' => __( 'Audio Format:' ),
+                       'codec'      => __( 'Audio Codec:' )
+               ) );
+
+               foreach ( $audio_fields as $key => $label ):
+                       if ( ! empty( $meta['audio'][$key] ) ) : ?>
+               <div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
+                       <?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][$key] ); ?></strong>
+               </div>
+       <?php
+                       endif;
+               endforeach;
+
+       endif;
+
+       if ( $media_dims ) : ?>
+       <div class="misc-pub-section misc-pub-dimensions">
+               <?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
+       </div>
+<?php
+       endif;
+}
+
+add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
+add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
+add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
+add_filter( 'async_upload_file',  'get_media_item', 10, 2 );
+
+add_action( 'media_upload_image', 'wp_media_upload_handler' );
+add_action( 'media_upload_audio', 'wp_media_upload_handler' );
+add_action( 'media_upload_video', 'wp_media_upload_handler' );
+add_action( 'media_upload_file',  'wp_media_upload_handler' );
+
+add_filter( 'media_upload_gallery', 'media_upload_gallery' );
+add_filter( 'media_upload_library', 'media_upload_library' );
+
+add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
+
+/**
+ * Parse ID3v2, ID3v1, and getID3 comments to extract usable data
+ *
+ * @since 3.6.0
+ *
+ * @param array $metadata An existing array with data
+ * @param array $data Data supplied by ID3 tags
+ */
+function wp_add_id3_tag_data( &$metadata, $data ) {
+       foreach ( array( 'id3v2', 'id3v1' ) as $version ) {
+               if ( ! empty( $data[$version]['comments'] ) ) {
+                       foreach ( $data[$version]['comments'] as $key => $list ) {
+                               if ( ! empty( $list ) ) {
+                                       $metadata[$key] = reset( $list );
+                                       // fix bug in byte stream analysis
+                                       if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) )
+                                               $metadata[$key] = 'Cop' . $metadata[$key];
+                               }
+                       }
+                       break;
+               }
+       }
+
+       if ( ! empty( $data['id3v2']['APIC'] ) ) {
+               $image = reset( $data['id3v2']['APIC']);
+               if ( ! empty( $image['data'] ) ) {
+                       $metadata['image'] = array(
+                               'data' => $image['data'],
+                               'mime' => $image['image_mime'],
+                               'width' => $image['image_width'],
+                               'height' => $image['image_height']
+                       );
+               }
+       } elseif ( ! empty( $data['comments']['picture'] ) ) {
+               $image = reset( $data['comments']['picture'] );
+               if ( ! empty( $image['data'] ) ) {
+                       $metadata['image'] = array(
+                               'data' => $image['data'],
+                               'mime' => $image['image_mime']
+                       );
+               }
+       }
+}
+
+/**
+ * Retrieve metadata from a video file's ID3 tags
+ *
+ * @since 3.6.0
+ *
+ * @param string $file Path to file.
+ * @return array|boolean Returns array of metadata, if found.
+ */
+function wp_read_video_metadata( $file ) {
+       if ( ! file_exists( $file ) )
+               return false;
+
+       $metadata = array();
+
+       if ( ! class_exists( 'getID3' ) )
+               require( ABSPATH . WPINC . '/ID3/getid3.php' );
+       $id3 = new getID3();
+       $data = $id3->analyze( $file );
+
+       if ( isset( $data['video']['lossless'] ) )
+               $metadata['lossless'] = $data['video']['lossless'];
+       if ( ! empty( $data['video']['bitrate'] ) )
+               $metadata['bitrate'] = (int) $data['video']['bitrate'];
+       if ( ! empty( $data['video']['bitrate_mode'] ) )
+               $metadata['bitrate_mode'] = $data['video']['bitrate_mode'];
+       if ( ! empty( $data['filesize'] ) )
+               $metadata['filesize'] = (int) $data['filesize'];
+       if ( ! empty( $data['mime_type'] ) )
+               $metadata['mime_type'] = $data['mime_type'];
+       if ( ! empty( $data['playtime_seconds'] ) )
+               $metadata['length'] = (int) ceil( $data['playtime_seconds'] );
+       if ( ! empty( $data['playtime_string'] ) )
+               $metadata['length_formatted'] = $data['playtime_string'];
+       if ( ! empty( $data['video']['resolution_x'] ) )
+               $metadata['width'] = (int) $data['video']['resolution_x'];
+       if ( ! empty( $data['video']['resolution_y'] ) )
+               $metadata['height'] = (int) $data['video']['resolution_y'];
+       if ( ! empty( $data['fileformat'] ) )
+               $metadata['fileformat'] = $data['fileformat'];
+       if ( ! empty( $data['video']['dataformat'] ) )
+               $metadata['dataformat'] = $data['video']['dataformat'];
+       if ( ! empty( $data['video']['encoder'] ) )
+               $metadata['encoder'] = $data['video']['encoder'];
+       if ( ! empty( $data['video']['codec'] ) )
+               $metadata['codec'] = $data['video']['codec'];
+
+       if ( ! empty( $data['audio'] ) ) {
+               unset( $data['audio']['streams'] );
+               $metadata['audio'] = $data['audio'];
+       }
+
+       wp_add_id3_tag_data( $metadata, $data );
+
+       return $metadata;
+}
+
+/**
+ * Retrieve metadata from a audio file's ID3 tags
+ *
+ * @since 3.6.0
+ *
+ * @param string $file Path to file.
+ * @return array|boolean Returns array of metadata, if found.
+ */
+function wp_read_audio_metadata( $file ) {
+       if ( ! file_exists( $file ) )
+               return false;
+       $metadata = array();
+
+       if ( ! class_exists( 'getID3' ) )
+               require( ABSPATH . WPINC . '/ID3/getid3.php' );
+       $id3 = new getID3();
+       $data = $id3->analyze( $file );
+
+       if ( ! empty( $data['audio'] ) ) {
+               unset( $data['audio']['streams'] );
+               $metadata = $data['audio'];
+       }
+
+       if ( ! empty( $data['fileformat'] ) )
+               $metadata['fileformat'] = $data['fileformat'];
+       if ( ! empty( $data['filesize'] ) )
+               $metadata['filesize'] = (int) $data['filesize'];
+       if ( ! empty( $data['mime_type'] ) )
+               $metadata['mime_type'] = $data['mime_type'];
+       if ( ! empty( $data['playtime_seconds'] ) )
+               $metadata['length'] = (int) ceil( $data['playtime_seconds'] );
+       if ( ! empty( $data['playtime_string'] ) )
+               $metadata['length_formatted'] = $data['playtime_string'];
+
+       wp_add_id3_tag_data( $metadata, $data );
+
+       return $metadata;
+}