media-new.php: Remove unused scripts, strings, error handling, save handling, and save button. fixes #22083.

git-svn-id: http://core.svn.wordpress.org/trunk@22764 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/includes/media.php

@@ -2185,16 +2185,11 @@ function media_upload_html_bypass() {
 add_action('post-html-upload-ui', 'media_upload_html_bypass');
 
 /**
- * Displays the "After a file has been uploaded..." message.
+ * Used to display a "After a file has been uploaded..." help message.
  *
  * @since 3.3.0
  */
-function media_upload_text_after() {
+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);
 
 /**
  * Displays the checkbox to scale images.

wp-admin/media-new.php

@@ -16,39 +16,25 @@ if (!current_user_can('upload_files'))
 	wp_die(__('You do not have permission to upload files.'));
 
 wp_enqueue_script('plupload-handlers');
-wp_enqueue_script('image-edit');
-wp_enqueue_script('set-post-thumbnail' );
-wp_enqueue_style('imgareaselect');
-wp_enqueue_script( 'media-gallery' );
-
-$errors = array();
 
 unset( $_REQUEST['post_id'] );
 
 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', $_REQUEST['post_id']);
-		unset($_FILES);
+		if ( is_wp_error( $id ) )
-		if ( is_wp_error($id) ) {
-			$errors['upload_error'] = $id;
-			$id = false;
-		}
-	}
-
-	$errors = array_merge($errors, (array) media_upload_form_handler());
-
-	$location = 'upload.php';
-	if ( $errors )
 			$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'),
@@ -58,8 +44,7 @@ if ( $_POST ) {
 		'<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>' .
+	'</ul>'
-		'<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'
 ) );
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __('For more information:') . '</strong></p>' .
@@ -67,11 +52,11 @@ if ( $_POST ) {
 	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
-	require_once('./admin-header.php');
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 $form_class = 'media-upload-form wp-upload-form type-form validate';
 
-	if ( get_user_setting('uploader') )
+if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
 	$form_class .= ' html-uploader';
 ?>
 <div class="wrap">
@@ -83,22 +68,13 @@ if ( $_POST ) {
 	<?php media_upload_form(); ?>
 
 	<script type="text/javascript">
-	jQuery(function($){
+	var post_id = 0, shortform = 3;
-		var preloaded = $(".media-item.preloaded");
-		if ( preloaded.length > 0 ) {
-			preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-		}
-		updateMediaForm();
-		post_id = 0;
-		shortform = 3;
-	});
 	</script>
 	<input type="hidden" name="post_id" id="post_id" value="0" />
 	<?php wp_nonce_field('media-form'); ?>
 	<div id="media-items" class="hide-if-no-js"></div>
-	<?php submit_button( __( 'Save all changes' ), 'button savebutton hidden', 'save' ); ?>
 	</form>
 </div>
 
 <?php
-	include('./admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );