diff -r f507feede89a -r 09a1c134465b web/wp-admin/media-new.php
--- a/web/wp-admin/media-new.php	Wed Dec 19 12:35:13 2012 -0800
+++ b/web/wp-admin/media-new.php	Wed Dec 19 17:46:52 2012 -0800
@@ -1,12 +1,85 @@
 <?php
 /**
- * Upload new media Administration Screen.
+ * Manage media uploaded file.
+ *
+ * There are many filters in here for media. Plugins can extend functionality
+ * by hooking into the filters.
  *
  * @package WordPress
  * @subpackage Administration
  */
 
-$_GET['inline'] = 'true';
-/** Administration bootstrap */
+/** Load WordPress Administration Bootstrap */
 require_once('./admin.php');
-require_once('./media-upload.php');
+
+if (!current_user_can('upload_files'))
+	wp_die(__('You do not have permission to upload files.'));
+
+wp_enqueue_script('plupload-handlers');
+
+$post_id = 0;
+if ( isset( $_REQUEST['post_id'] ) ) {
+	$post_id = absint( $_REQUEST['post_id'] );
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+		$post_id = 0;
+}
+
+if ( $_POST ) {
+	$location = 'upload.php';
+	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
+		check_admin_referer('media-form');
+		// Upload File button was clicked
+		$id = media_handle_upload( 'async-upload', $post_id );
+		if ( is_wp_error( $id ) )
+			$location .= '?message=3';
+	}
+	wp_redirect( admin_url( $location ) );
+	exit;
+}
+
+$title = __('Upload New Media');
+$parent_file = 'upload.php';
+
+get_current_screen()->add_help_tab( array(
+'id'		=> 'overview',
+'title'		=> __('Overview'),
+'content'	=>
+	'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
+	'<ul>' .
+		'<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
+		'<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
+		'<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .
+	'</ul>'
+) );
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</a>') . '</p>' .
+	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+);
+
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
+
+$form_class = 'media-upload-form type-form validate';
+
+if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
+	$form_class .= ' html-uploader';
+?>
+<div class="wrap">
+	<?php screen_icon(); ?>
+	<h2><?php echo esc_html( $title ); ?></h2>
+
+	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo $form_class; ?>" id="file-form">
+
+	<?php media_upload_form(); ?>
+
+	<script type="text/javascript">
+	var post_id = <?php echo $post_id; ?>, shortform = 3;
+	</script>
+	<input type="hidden" name="post_id" id="post_id" value="<?php echo $post_id; ?>" />
+	<?php wp_nonce_field('media-form'); ?>
+	<div id="media-items" class="hide-if-no-js"></div>
+	</form>
+</div>
+
+<?php
+include( ABSPATH . 'wp-admin/admin-footer.php' );