X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fef8173b8c3bad08f495551e43cfdeac1cae6021..refs/tags/wordpress-3.4.2-scripts:/wp-admin/includes/media.php

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 5a13bcc2..179bfb8f 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -64,6 +64,7 @@ add_filter('media_upload_tabs', 'update_gallery_tab');
 function the_media_upload_tabs() {
 	global $redir_tab;
 	$tabs = media_upload_tabs();
+	$default = 'type';
 
 	if ( !empty($tabs) ) {
 		echo "<ul id='sidemenu'>\n";
@@ -72,13 +73,15 @@ function the_media_upload_tabs() {
 		elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) )
 			$current = $_GET['tab'];
 		else
-			$current = apply_filters('media_upload_default_tab', 'type');
+			$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));
+
+			$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";
 		}
@@ -135,27 +138,37 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $
 
 	$id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 
-	if ( ! preg_match( '/width="([0-9]+)/', $html, $matches ) )
+	if ( ! preg_match( '/width=["\']([0-9]+)/', $html, $matches ) )
 		return $html;
 
 	$width = $matches[1];
 
-	$caption = str_replace(	array( '>',    '<',    '"',      "'" ),
-							array( '&gt;', '&lt;', '&quot;', '&#039;' ),
-							$caption
-						  );
+	$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 . '" caption="' . addslashes($caption) . '"]' . $html . '[/caption]';
+	$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] );
+}
+
 /**
  * {@internal Missing Short Description}}
  *
@@ -228,6 +241,10 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
 		'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_id);
 	if ( !is_wp_error($id) ) {
@@ -270,7 +287,8 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data =
 			$content = $image_meta['caption'];
 	}
 
-	$title = isset($desc) ? $desc : '';
+	if ( isset( $desc ) )
+		$title = $desc;
 
 	// Construct the attachment array
 	$attachment = array_merge( array(
@@ -281,6 +299,10 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data =
 		'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) )
@@ -300,15 +322,11 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data =
  * @param unknown_type $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_enqueue_style( 'global' );
-wp_enqueue_style( 'wp-admin' );
+
 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' ) )
@@ -320,7 +338,7 @@ wp_enqueue_style( 'ie' );
 //<![CDATA[
 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 userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time(); ?>'};
-var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
+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>
@@ -337,7 +355,10 @@ 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="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);
@@ -356,45 +377,33 @@ if ( is_string($content_func) )
  *
  * @since 2.5.0
  */
-function media_buttons() {
-	$do_image = $do_audio = $do_video = true;
-	if ( is_multisite() ) {
-		$media_buttons = get_site_option( 'mu_media_buttons' );
-		if ( empty($media_buttons['image']) )
-			$do_image = false;
-		if ( empty($media_buttons['audio']) )
-			$do_audio = false;
-		if ( empty($media_buttons['video']) )
-			$do_video = false;
-	}
-	$out = '';
-
-	if ( $do_image )
-		$out .= _media_button(__('Add an Image'), 'images/media-button-image.gif?ver=20100531', 'image');
-	if ( $do_video )
-		$out .= _media_button(__('Add Video'), 'images/media-button-video.gif?ver=20100531', 'video');
-	if ( $do_audio )
-		$out .= _media_button(__('Add Audio'), 'images/media-button-music.gif?ver=20100531', 'audio');
-
-	$out .= _media_button(__('Add Media'), 'images/media-button-other.gif?ver=20100531', 'media');
-
+function media_buttons($editor_id = 'content') {
 	$context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
 
-	printf($context, $out);
+	$img = '<img src="' . esc_url( admin_url( 'images/media-button.png?ver=20111005' ) ) . '" width="15" height="15" />';
+
+	echo '<a href="' . esc_url( get_upload_iframe_src() ) . '" class="thickbox add_media" id="' . esc_attr( $editor_id ) . '-add_media" title="' . esc_attr__( 'Add Media' ) . '" onclick="return false;">' . sprintf( $context, $img ) . '</a>';
 }
 add_action( 'media_buttons', 'media_buttons' );
 
-function _media_button($title, $icon, $type) {
-	return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='add_$type' class='thickbox' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' onclick='return false;' /></a>";
+function _media_button($title, $icon, $type, $id) {
+	return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='{$id}-add_{$type}' class='thickbox add_$type' title='" . esc_attr( $title ) . "'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' onclick='return false;' /></a>";
 }
 
-function get_upload_iframe_src($type) {
-	global $post_ID, $temp_ID;
-	$uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
-	$upload_iframe_src = add_query_arg('post_id', $uploading_iframe_ID, 'media-upload.php');
+function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) {
+	global $post_ID;
 
-	if ( 'media' != $type )
+	if ( empty( $post_id ) )
+		$post_id = $post_ID;
+
+	$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);
+
 	$upload_iframe_src = apply_filters($type . '_upload_iframe_src', $upload_iframe_src);
 
 	return add_query_arg('TB_iframe', true, $upload_iframe_src);
@@ -419,6 +428,11 @@ function media_upload_form_handler() {
 
 	if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
 		$post = $_post = get_post($attachment_id, ARRAY_A);
+		$post_type_object = get_post_type_object( $post[ 'post_type' ] );
+
+		if ( !current_user_can( $post_type_object->cap->edit_post, $attachment_id ) )
+			continue;
+
 		if ( isset($attachment['post_content']) )
 			$post['post_content'] = $attachment['post_content'];
 		if ( isset($attachment['post_title']) )
@@ -472,7 +486,7 @@ function media_upload_form_handler() {
 	if ( isset($send_id) ) {
 		$attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
 
-		$html = $attachment['post_title'];
+		$html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
 		if ( !empty($attachment['url']) ) {
 			$rel = '';
 			if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'] )
@@ -494,11 +508,12 @@ function media_upload_form_handler() {
  *
  * @return unknown
  */
-function media_upload_image() {
+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);
@@ -509,20 +524,37 @@ function media_upload_image() {
 	}
 
 	if ( !empty($_POST['insertonlybutton']) ) {
-		$alt = $align = '';
-
-		$src = $_POST['insertonly']['src'];
+		$src = $_POST['src'];
 		if ( !empty($src) && !strpos($src, '://') )
 			$src = "http://$src";
-		$alt = esc_attr($_POST['insertonly']['alt']);
-		if ( isset($_POST['insertonly']['align']) ) {
-			$align = esc_attr($_POST['insertonly']['align']);
-			$class = " class='align$align'";
+
+		if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) {
+			$title = esc_html( stripslashes( $_POST['title'] ) );
+			if ( empty( $title ) )
+				$title = esc_html( basename( $src ) );
+
+			if ( $title && $src )
+				$html = "<a href='" . esc_url($src) . "'>$title</a>";
+
+			$type = 'file';
+			if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
+				&& ( 'audio' == $ext_type || 'video' == $ext_type ) )
+					$type = $ext_type;
+
+			$html = apply_filters( $type . '_send_to_editor_url', $html, esc_url_raw( $src ), $title );
+		} else {
+			$align = '';
+			$alt = esc_attr( stripslashes( $_POST['alt'] ) );
+			if ( isset($_POST['align']) ) {
+				$align = esc_attr( stripslashes( $_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($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);
 		return media_send_to_editor($html);
 	}
 
@@ -540,8 +572,12 @@ function media_upload_image() {
 		return media_upload_gallery();
 	}
 
-	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-		return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id );
+	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) {
+		$type = 'image';
+		if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) )
+			$type = $_GET['type'];
+		return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
+	}
 
 	return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
 }
@@ -592,177 +628,6 @@ function media_sideload_image($file, $post_id, $desc = null) {
 	}
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.0
- *
- * @return unknown
- */
-function media_upload_audio() {
-	$errors = array();
-	$id = 0;
-
-	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 = esc_attr($_POST['insertonly']['title']);
-		if ( empty($title) )
-            $title = esc_attr( basename($href) );
-
-		if ( !empty($title) && !empty($href) )
-            $html = "<a href='" . esc_url($href) . "' >$title</a>";
-
-		$html = apply_filters('audio_send_to_editor_url', $html, $href, $title);
-
-		return media_send_to_editor($html);
-	}
-
-	if ( !empty($_POST) ) {
-		$return = media_upload_form_handler();
-
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
-	}
-
-	if ( isset($_POST['save']) ) {
-		$errors['upload_notice'] = __('Saved.');
-		return media_upload_gallery();
-	}
-
-	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-		return wp_iframe( 'media_upload_type_url_form', 'audio', $errors, $id );
-
-	return wp_iframe( 'media_upload_type_form', 'audio', $errors, $id );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.0
- *
- * @return unknown
- */
-function media_upload_video() {
-	$errors = array();
-	$id = 0;
-
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-		// Upload File button was clicked
-		$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-		unset($_FILES);
-		if ( is_wp_error($id) ) {
-			$errors['upload_error'] = $id;
-			$id = false;
-		}
-	}
-
-	if ( !empty($_POST['insertonlybutton']) ) {
-		$href = $_POST['insertonly']['href'];
-		if ( !empty($href) && !strpos($href, '://') )
-			$href = "http://$href";
-
-		$title = esc_attr($_POST['insertonly']['title']);
-        if ( empty($title) )
-            $title = esc_attr( basename($href) );
-
-		if ( !empty($title) && !empty($href) )
-            $html = "<a href='" . esc_url($href) . "' >$title</a>";
-
-		$html = apply_filters('video_send_to_editor_url', $html, $href, $title);
-
-		return media_send_to_editor($html);
-	}
-
-	if ( !empty($_POST) ) {
-		$return = media_upload_form_handler();
-
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
-	}
-
-	if ( isset($_POST['save']) ) {
-		$errors['upload_notice'] = __('Saved.');
-		return media_upload_gallery();
-	}
-
-	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-		return wp_iframe( 'media_upload_type_url_form', 'video', $errors, $id );
-
-	return wp_iframe( 'media_upload_type_form', 'video', $errors, $id );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.5.0
- *
- * @return unknown
- */
-function media_upload_file() {
-	$errors = array();
-	$id = 0;
-
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-		// Upload File button was clicked
-		$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-		unset($_FILES);
-		if ( is_wp_error($id) ) {
-			$errors['upload_error'] = $id;
-			$id = false;
-		}
-	}
-
-	if ( !empty($_POST['insertonlybutton']) ) {
-		$href = $_POST['insertonly']['href'];
-		if ( !empty($href) && !strpos($href, '://') )
-			$href = "http://$href";
-
-		$title = esc_attr($_POST['insertonly']['title']);
-		if ( empty($title) )
-			$title = basename($href);
-		if ( !empty($title) && !empty($href) )
-			$html = "<a href='" . esc_url($href) . "' >$title</a>";
-		$html = apply_filters('file_send_to_editor_url', $html, esc_url_raw($href), $title);
-		return media_send_to_editor($html);
-	}
-
-	if ( !empty($_POST) ) {
-		$return = media_upload_form_handler();
-
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
-	}
-
-	if ( isset($_POST['save']) ) {
-		$errors['upload_notice'] = __('Saved.');
-		return media_upload_gallery();
-	}
-
-	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' )
-		return wp_iframe( 'media_upload_type_url_form', 'file', $errors, $id );
-
-	return wp_iframe( 'media_upload_type_form', 'file', $errors, $id );
-}
-
 /**
  * {@internal Missing Short Description}}
  *
@@ -847,7 +712,7 @@ function image_align_input_fields( $post, $checked = '' ) {
 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 = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size'));
+		$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');
@@ -915,12 +780,19 @@ function image_link_input_fields($post, $url_type = '') {
 
 	return "
 	<input type='text' class='text urlfield' name='attachments[$post->ID][url]' value='" . esc_attr($url) . "' /><br />
-	<button type='button' class='button urlnone' title=''>" . __('None') . "</button>
-	<button type='button' class='button urlfile' title='" . esc_attr($file) . "'>" . __('File URL') . "</button>
-	<button type='button' class='button urlpost' title='" . esc_attr($link) . "'>" . __('Post URL') . "</button>
+	<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}}
  *
@@ -1056,8 +928,6 @@ function get_attachment_fields_to_edit($post, $errors = null) {
 
 	$edit_post = sanitize_post($post, 'edit');
 
-
-
 	$form_fields = array(
 		'post_title'   => array(
 			'label'      => __('Title'),
@@ -1066,7 +936,8 @@ function get_attachment_fields_to_edit($post, $errors = null) {
 		'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'),
@@ -1155,7 +1026,7 @@ function get_media_items( $post_id, $errors ) {
 		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;
@@ -1179,8 +1050,9 @@ function get_media_item( $attachment_id, $args = null ) {
 		$thumb_url = false;
 
 	$post = get_post( $attachment_id );
+	$current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0;
 
-	$default_args = array( 'errors' => null, 'send' => $post->post_parent ? post_type_supports( get_post_type( $post->post_parent ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true );
+	$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 );
@@ -1188,7 +1060,7 @@ function get_media_item( $attachment_id, $args = null ) {
 	$toggle_on  = __( 'Show' );
 	$toggle_off = __( 'Hide' );
 
-	$filename = basename( $post->guid );
+	$filename = esc_html( basename( $post->guid ) );
 	$title = esc_attr( $post->post_title );
 
 	if ( $_tags = get_the_tags( $attachment_id ) ) {
@@ -1210,7 +1082,7 @@ function get_media_item( $attachment_id, $args = null ) {
 	<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 = '';
 	}
 
@@ -1255,7 +1127,7 @@ function get_media_item( $attachment_id, $args = null ) {
 		<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='' style='margin-top: 3px' /></a></p>
+			<p><a href='$attachment_url' target='_blank'><img class='thumbnail' src='$thumb_url' alt='' /></a></p>
 			<p>$image_edit_button</p>
 			</td>
 			<td>
@@ -1267,8 +1139,6 @@ function get_media_item( $attachment_id, $args = null ) {
 
 			$item .= "</td></tr>\n";
 
-
-
 	$item .= "
 		</thead>
 		<tbody>
@@ -1289,7 +1159,7 @@ function get_media_item( $attachment_id, $args = null ) {
 			$delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( '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;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "
+			 <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-attachment_' . $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>";
@@ -1307,7 +1177,8 @@ function get_media_item( $attachment_id, $args = null ) {
 		$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 ) ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
+	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>";
 	}
@@ -1343,10 +1214,12 @@ function get_media_item( $attachment_id, $args = null ) {
 		if ( !empty( $field[ $field['input'] ] ) )
 			$item .= $field[ $field['input'] ];
 		elseif ( $field['input'] == 'textarea' ) {
-			if ( user_can_richedit() ) { // textarea_escaped when user_can_richedit() = false
-				$field['value'] = esc_textarea( $field['value'] );
+			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 type='text' id='$name' name='$name' $aria_required>" . $field['value'] . '</textarea>';
+			// 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' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
 		}
@@ -1409,22 +1282,25 @@ function media_upload_header() {
  * @param unknown_type $errors
  */
 function media_upload_form( $errors = null ) {
-	global $type, $tab, $pagenow;
-
-	$flash_action_url = admin_url('async-upload.php');
+	global $type, $tab, $pagenow, $is_IE, $is_opera;
 
-	// If Mac and mod_security, no Flash. :(
-	$flash = true;
-	if ( false !== stripos($_SERVER['HTTP_USER_AGENT'], 'mac') && apache_mod_loaded('mod_security') )
-		$flash = false;
+	if ( ! _device_can_upload() ) {
+		echo '<p>' . __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="http://wordpress.org/extend/mobile/">native app for your device</a> instead.') . '</p>';
+		return;
+	}
 
-	$flash = apply_filters('flash_uploader', $flash);
+	$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 : '';
 
-	$upload_size_unit = $max_upload_size =  wp_max_upload_size();
+	$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++ )
+
+	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;
@@ -1432,26 +1308,19 @@ function media_upload_form( $errors = null ) {
 		$upload_size_unit = (int) $upload_size_unit;
 	}
 ?>
-<script type="text/javascript">
-//<![CDATA[
-var uploaderMode = 0;
-jQuery(document).ready(function($){
-	uploaderMode = getUserSetting('uploader');
-	$('.upload-html-bypass a').click(function(){deleteUserSetting('uploader');uploaderMode=0;swfuploadPreLoad();return false;});
-	$('.upload-flash-bypass a').click(function(){setUserSetting('uploader', '1');uploaderMode=1;swfuploadPreLoad();return false;});
-});
-//]]>
-</script>
-<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>
+
+<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
 // Check quota for this blog if multisite
 if ( is_multisite() && !is_upload_space_available() ) {
@@ -1461,93 +1330,64 @@ if ( is_multisite() && !is_upload_space_available() ) {
 
 do_action('pre-upload-ui');
 
-if ( $flash ) :
-
-// Set the post params, which SWFUpload will post back with the file, and pass
-// them through a filter.
 $post_params = array(
 		"post_id" => $post_id,
-		"auth_cookie" => (is_ssl() ? $_COOKIE[SECURE_AUTH_COOKIE] : $_COOKIE[AUTH_COOKIE]),
-		"logged_in_cookie" => $_COOKIE[LOGGED_IN_COOKIE],
 		"_wpnonce" => wp_create_nonce('media-form'),
-		"type" => $type,
-		"tab" => $tab,
+		"type" => $_type,
+		"tab" => $_tab,
 		"short" => "1",
 );
-$post_params = apply_filters( 'swfupload_post_params', $post_params );
-$p = array();
-foreach ( $post_params as $param => $val )
-	$p[] = "\t\t'$param' : '$val'";
-$post_params_str = implode( ", \n", $p );
-
-// #8545. wmode=transparent cannot be used with SWFUpload
-if ( 'media-new.php' == $pagenow ) {
-	$upload_image_path = get_user_option( 'admin_color' );
-	if ( 'classic' != $upload_image_path )
-		$upload_image_path = 'fresh';
-	$upload_image_path = admin_url( 'images/upload-' . $upload_image_path . '.png?ver=20101205' );
-} else {
-	$upload_image_path = includes_url( 'images/upload.png?ver=20100531' );
-}
+
+$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
+);
+
+$plupload_init = apply_filters( 'plupload_init', $plupload_init );
 
 ?>
+
 <script type="text/javascript">
-//<![CDATA[
-var swfu;
-SWFUpload.onload = function() {
-	var settings = {
-			button_text: '<span class="button"><?php _e('Select Files'); ?><\/span>',
-			button_text_style: '.button { text-align: center; font-weight: bold; font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif; font-size: 11px; text-shadow: 0 1px 0 #FFFFFF; color:#464646; }',
-			button_height: "23",
-			button_width: "132",
-			button_text_top_padding: 3,
-			button_image_url: '<?php echo $upload_image_path; ?>',
-			button_placeholder_id: "flash-browse-button",
-			upload_url : "<?php echo esc_attr( $flash_action_url ); ?>",
-			flash_url : "<?php echo includes_url('js/swfupload/swfupload.swf'); ?>",
-			file_post_name: "async-upload",
-			file_types: "<?php echo apply_filters('upload_file_glob', '*.*'); ?>",
-			post_params : {
-				<?php echo $post_params_str; ?>
-			},
-			file_size_limit : "<?php echo $max_upload_size; ?>b",
-			file_dialog_start_handler : fileDialogStart,
-			file_queued_handler : fileQueued,
-			upload_start_handler : uploadStart,
-			upload_progress_handler : uploadProgress,
-			upload_error_handler : uploadError,
-			upload_success_handler : <?php echo apply_filters( 'swfupload_success_handler', 'uploadSuccess' ); ?>,
-			upload_complete_handler : uploadComplete,
-			file_queue_error_handler : fileQueueError,
-			file_dialog_complete_handler : fileDialogComplete,
-			swfupload_pre_load_handler: swfuploadPreLoad,
-			swfupload_load_failed_handler: swfuploadLoadFailed,
-			custom_settings : {
-				degraded_element_id : "html-upload-ui", // id of the element displayed when swfupload is unavailable
-				swfupload_element_id : "flash-upload-ui" // id of the element displayed when swfupload is available
-			},
-			debug: false
-		};
-		swfu = new SWFUpload(settings);
-};
-//]]>
+<?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" class="hide-if-no-js">
-<?php do_action('pre-flash-upload-ui'); ?>
-
-	<div>
-	<?php _e( 'Choose files to upload' ); ?>
-	<div id="flash-browse-button"></div>
-	<span><input id="cancel-upload" disabled="disabled" onclick="cancelUpload()" type="button" value="<?php esc_attr_e('Cancel Upload'); ?>" class="button" /></span>
+<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>
-	<p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
-<?php do_action('post-flash-upload-ui'); ?>
-	<p class="howto"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
 </div>
-<?php endif; // $flash ?>
+<?php do_action('post-plupload-upload-ui'); // hook change, old name: 'post-flash-upload-ui' ?>
+</div>
 
-<div id="html-upload-ui">
+<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>
@@ -1556,14 +1396,16 @@ SWFUpload.onload = function() {
 		<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
 	</p>
 	<div class="clear"></div>
-	<p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
-	<?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 update to lighttpd 1.5.'); ?></p>
-	<?php endif;?>
-<?php do_action('post-html-upload-ui', $flash); ?>
+<?php do_action('post-html-upload-ui'); ?>
 </div>
-<?php do_action('post-upload-ui'); ?>
+
+<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');
 }
 
 /**
@@ -1576,15 +1418,20 @@ SWFUpload.onload = function() {
  * @param unknown_type $id
  */
 function media_upload_type_form($type = 'file', $errors = null, $id = null) {
+
 	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_attr($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_attr($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'); ?>
@@ -1604,19 +1451,19 @@ jQuery(function($){
 });
 //]]>
 </script>
-<div id="media-items">
-<?php
+<div id="media-items"><?php
+
 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>';
+		echo '<div id="media-upload-error">'.esc_html($id->get_error_message()).'</div></div>';
 		exit;
 	}
 }
-?>
-</div>
+?></div>
+
 <p class="savebutton ml-submit">
 <?php submit_button( __( 'Save all changes' ), 'button', 'save', false ); ?>
 </p>
@@ -1633,24 +1480,27 @@ if ( $id ) {
  * @param unknown_type $errors
  * @param unknown_type $id
  */
-function media_upload_type_url_form($type = 'file', $errors = null, $id = null) {
+function media_upload_type_url_form($type = null, $errors = null, $id = null) {
+	if ( null === $type )
+		$type = 'image';
+
 	media_upload_header();
 
 	$post_id = intval($_REQUEST['post_id']);
 
 	$form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
 	$form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
+	$form_class = 'media-upload-form type-form validate';
 
-	$callback = "type_url_form_$type";
+	if ( get_user_setting('uploader') )
+		$form_class .= ' html-uploader';
 ?>
 
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($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_attr($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'); ?>
 
-<?php if ( is_callable($callback) ) { ?>
-
-<h3 class="media-title"><?php _e('Add media file from URL'); ?></h3>
+<h3 class="media-title"><?php _e('Insert media from another website'); ?></h3>
 
 <script type="text/javascript">
 //<![CDATA[
@@ -1675,19 +1525,27 @@ var addExtImage = {
 			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(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+		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+'"'+title+cls+' width="'+t.width+'" height="'+t.height+'" />';
 
-		if ( f.url.value )
-			html = '<a href="'+f.url.value+'">'+html+'</a>';
+		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+'" caption="'+caption+'"]'+html+'[/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);
@@ -1714,12 +1572,16 @@ var addExtImage = {
 	},
 
 	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="" />';
 		t.preloadImg = new Image();
 		t.preloadImg.onload = t.updateImageData;
@@ -1727,19 +1589,23 @@ var addExtImage = {
 		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 apply_filters($callback, call_user_func($callback)); ?>
+<?php echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) ); ?>
 </div>
 </div>
 </form>
 <?php
-	} else {
-		wp_die( __('Unknown action.') );
-	}
 }
 
 /**
@@ -1758,6 +1624,10 @@ function media_upload_gallery_form($errors) {
 	$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';
+
+	if ( get_user_setting('uploader') )
+		$form_class .= ' html-uploader';
 ?>
 
 <script type="text/javascript">
@@ -1782,7 +1652,7 @@ jQuery(function($){
 <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_attr($form_action_url); ?>" class="media-upload-form validate" id="gallery-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($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">
@@ -1832,7 +1702,7 @@ jQuery(function($){
 		<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="ID"><?php _e('Date/Time'); ?></option>
+			<option value="post_date"><?php _e('Date/Time'); ?></option>
 			<option value="rand"><?php _e('Random'); ?></option>
 		</select>
 	</td>
@@ -1900,6 +1770,10 @@ function media_upload_library_form($errors) {
 
 	$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';
+
+	if ( get_user_setting('uploader') )
+		$form_class .= ' html-uploader';
 
 	$_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
 	if ( $_GET['paged'] < 1 )
@@ -1918,10 +1792,11 @@ function media_upload_library_form($errors) {
 <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 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'] ) : ''; ?>" />
 
 <p id="media-search" class="search-box">
 	<label class="screen-reader-text" for="media-search-input"><?php _e('Search Media');?>:</label>
-	<input type="text" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
+	<input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
 	<?php submit_button( __( 'Search Media' ), 'button', '', false ); ?>
 </p>
 
@@ -2017,7 +1892,7 @@ foreach ($arc_result as $arc_row) {
 </div>
 </form>
 
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form validate" id="library-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="<?php echo $form_class; ?>" id="library-form">
 
 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>
@@ -2053,14 +1928,14 @@ jQuery(function($){
  *
  * @return unknown
  */
-function type_url_form_image() {
+function wp_media_insert_url_form( $default_view = 'image' ) {
 	if ( !apply_filters( 'disable_captions', '' ) ) {
 		$caption = '
-		<tr>
+		<tr class="image-only">
 			<th valign="top" scope="row" class="label">
 				<span class="alignleft"><label for="caption">' . __('Image Caption') . '</label></span>
 			</th>
-			<td class="field"><input id="caption" name="caption" value="" type="text" /></td>
+			<td class="field"><textarea id="caption" name="caption"></textarea></td>
 		</tr>
 ';
 	} else {
@@ -2071,12 +1946,19 @@ function type_url_form_image() {
 	if ( empty($default_align) )
 		$default_align = 'none';
 
+	if ( 'image' == $default_view ) {
+		$view = 'image-only';
+		$table_class = '';
+	} else {
+		$view = $table_class = 'not-image';
+	}
+
 	return '
-	<h4 class="media-sub-title">' . __('Insert an image from another web site') . '</h4>
-	<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" style="width:130px;">
-				<span class="alignleft"><label for="src">' . __('Image URL') . '</label></span>
+				<span class="alignleft"><label for="src">' . __('URL') . '</label></span>
 				<span class="alignright"><abbr id="status_img" title="required" class="required">*</abbr></span>
 			</th>
 			<td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td>
@@ -2084,13 +1966,15 @@ function type_url_form_image() {
 
 		<tr>
 			<th valign="top" scope="row" class="label">
-				<span class="alignleft"><label for="title">' . __('Image Title') . '</label></span>
+				<span class="alignleft"><label for="title">' . __('Title') . '</label></span>
 				<span class="alignright"><abbr title="required" class="required">*</abbr></span>
 			</th>
 			<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="alt">' . __('Alternate Text') . '</label></span>
 			</th>
@@ -2098,7 +1982,7 @@ function type_url_form_image() {
 			<p class="help">' . __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;') . '</p></td>
 		</tr>
 		' . $caption . '
-		<tr class="align">
+		<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"' : '').' />
@@ -2112,7 +1996,7 @@ function type_url_form_image() {
 			</td>
 		</tr>
 
-		<tr>
+		<tr class="image-only">
 			<th valign="top" scope="row" class="label">
 				<span class="alignleft"><label for="url">' . __('Link Image To:') . '</label></span>
 			</th>
@@ -2122,103 +2006,23 @@ function type_url_form_image() {
 			<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>
-	' . _insert_into_post_button('image') . '
-	</tbody></table>
-';
-
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.7.0
- *
- * @return unknown
- */
-function type_url_form_audio() {
-	return '
-	<table class="describe"><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>
-			<td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></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" aria-required="true"></td>
-		</tr>
-		<tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Still Alive by Jonathan Coulton&#8221;') . '</td></tr>
-	' . _insert_into_post_button('audio') . '
-	</tbody></table>
-';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.7.0
- *
- * @return unknown
- */
-function type_url_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>
-				<span class="alignright"><abbr title="required" class="required">*</abbr></span>
-			</th>
-			<td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></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>
-			<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" aria-required="true"></td>
+		<tr class="not-image">
+			<td></td>
+			<td>
+				' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . '
+			</td>
 		</tr>
-		<tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Lucy on YouTube&#8221;') . '</td></tr>
-	' . _insert_into_post_button('video') . '
 	</tbody></table>
 ';
-}
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.7.0
- *
- * @return unknown
- */
-function type_url_form_file() {
-	return '
-	<table class="describe"><tbody>
-		<tr>
-			<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>
-			</th>
-			<td class="field"><input id="insertonly[href]" name="insertonly[href]" value="" type="text" aria-required="true"></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" aria-required="true"></td>
-		</tr>
-		<tr><td></td><td class="help">' . __('Link text, e.g. &#8220;Ransom Demands (PDF)&#8221;') . '</td></tr>
-	' . _insert_into_post_button('file') . '
-	</tbody></table>
-';
 }
 
-
 function _insert_into_post_button($type) {
 	if ( !post_type_supports(get_post_type($_GET['post_id']), 'editor') )
 		return '';
@@ -2243,82 +2047,74 @@ function _insert_into_post_button($type) {
 	';
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * Support a GET parameter for disabling the flash uploader.
- *
- * @since 2.6.0
- *
- * @param unknown_type $flash
- * @return unknown
- */
-function media_upload_use_flash($flash) {
-	if ( array_key_exists('flash', $_REQUEST) )
-		$flash = !empty($_REQUEST['flash']);
-	return $flash;
-}
-
-add_filter('flash_uploader', 'media_upload_use_flash');
-
 /**
  * {@internal Missing Short Description}}
  *
  * @since 2.6.0
  */
 function media_upload_flash_bypass() {
-	echo '<p class="upload-flash-bypass">';
-	printf( __('You are using the Flash uploader.  Problems?  Try the <a href="%s">Browser uploader</a> instead.'), esc_url(add_query_arg('flash', 0)) );
-	echo '</p>';
+	?>
+	<p class="upload-flash-bypass">
+	<?php _e('You are using the multi-file uploader. Problems? Try the <a href="#">browser uploader</a> instead.'); ?>
+	</p>
+	<?php
 }
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
 
 /**
  * {@internal Missing Short Description}}
  *
  * @since 2.6.0
  */
-function media_upload_html_bypass($flash = true) {
-	echo '<p class="upload-html-bypass hide-if-no-js">';
-	_e('You are using the Browser uploader.');
-	if ( $flash ) {
-		// the user manually selected the browser uploader, so let them switch back to Flash
-		echo ' ';
-		printf( __('Try the <a href="%s">Flash uploader</a> instead.'), esc_url(add_query_arg('flash', 1)) );
-	}
-	echo "</p>\n";
+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-flash-upload-ui', 'media_upload_flash_bypass');
 add_action('post-html-upload-ui', 'media_upload_html_bypass');
 
+function media_upload_text_after() {
+	?>
+	<span class="after-file-upload"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></span>
+	<?php
+}
+add_action('post-upload-ui', 'media_upload_text_after', 5);
+
 /**
  * {@internal Missing Short Description}}
  *
- * Make sure the GET parameter sticks when we submit a form.
- *
  * @since 2.6.0
- *
- * @param unknown_type $url
- * @return unknown
  */
-function media_upload_bypass_url($url) {
-	if ( array_key_exists('flash', $_REQUEST) )
-		$url = add_query_arg('flash', intval($_REQUEST['flash']));
-	return $url;
-}
+function media_upload_max_image_resize() {
+	$checked = get_user_setting('upload_resize') ? ' checked="true"' : '';
+	$a = $end = '';
 
-add_filter('media_upload_form_url', 'media_upload_bypass_url');
-
-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);
+	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
+}
 
-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_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_filter('media_upload_gallery', 'media_upload_gallery');
+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_library', 'media_upload_library');
+add_filter( 'media_upload_gallery', 'media_upload_gallery' );
+add_filter( 'media_upload_library', 'media_upload_library' );