X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..9b5673a7aae863ab45c3b73460060352c5b3810b:/wp-admin/media-upload.php

diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 9ba2268f..bd21e4bc 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -10,15 +10,16 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
 
 if (!current_user_can('upload_files'))
 	wp_die(__('You do not have permission to upload files.'));
 
-wp_enqueue_script('swfupload');
-wp_enqueue_script('swfupload-swfobject');
-wp_enqueue_script('swfupload-queue');
+wp_enqueue_script('swfupload-all');
 wp_enqueue_script('swfupload-handlers');
+wp_enqueue_script('image-edit');
+wp_enqueue_script('set-post-thumbnail' );
+wp_enqueue_style('imgareaselect');
 
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
@@ -31,16 +32,7 @@ if ( isset($action) && $action == 'edit' && !$ID )
 	wp_die(__("You are not allowed to be here"));
 
 if ( isset($_GET['inline']) ) {
-
-	if ( isset($_GET['upload-page-form']) ) {
-		$errors = media_upload_form_handler();
-
-		$location = 'upload.php';
-		if ( $errors )
-			$location .= '?message=3';
-
-		wp_redirect( admin_url($location) );
-	}
+	$errors = array();
 
 	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
 		// Upload File button was clicked
@@ -52,14 +44,33 @@ if ( isset($_GET['inline']) ) {
 		}
 	}
 
+	if ( isset($_GET['upload-page-form']) ) {
+		$errors = array_merge($errors, (array) media_upload_form_handler());
+
+		$location = 'upload.php';
+		if ( $errors )
+			$location .= '?message=3';
+
+		wp_redirect( admin_url($location) );
+	}
+
 	$title = __('Upload New Media');
 	$parent_file = 'upload.php';
-	require_once('admin-header.php'); ?>
+
+	add_contextual_help( $current_screen,
+'<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.') . '</p>' .
+		'<p>' . __('There are two options for uploading files: <em>Select Files</em> will open the Flash-based uploader (multiple file upload allowed), or you can use the <em>Browser Uploader</em>. Clicking <em>Select Files</em> opens a navigation window showing you files in your operating system. Selecting <em>Open</em> after clicking on the file you want activates a progress bar on the uploader screen. Basic image editing is available after upload is complete. Make sure you click <em>Save</em> before leaving this screen.') . '</p>' .
+		'<p><strong>' . __('For more information:') . '</strong></p>' .
+		'<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_SubPanel" target="_blank">Documentation on Uploading Media Files</a>') . '</p>' .
+		'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	);
+
+	require_once('./admin-header.php'); ?>
 	<div class="wrap">
 	<?php screen_icon(); ?>
-	<h2><?php echo wp_specialchars( $title ); ?></h2>
+	<h2><?php echo esc_html( $title ); ?></h2>
 
-	<form enctype="multipart/form-data" method="post" action="media-upload.php?inline=&amp;upload-page-form=" class="media-upload-form type-form validate" id="file-form">
+	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-upload.php?inline=&amp;upload-page-form='); ?>" class="media-upload-form type-form validate" id="file-form">
 
 	<?php media_upload_form(); ?>
 
@@ -76,15 +87,15 @@ if ( isset($_GET['inline']) ) {
 	</script>
 	<input type="hidden" name="post_id" id="post_id" value="0" />
 	<?php wp_nonce_field('media-form'); ?>
-	<div id="media-items"> </div>
+	<div id="media-items" class="hide-if-no-js"> </div>
 	<p>
-	<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
+	<input type="submit" class="button savebutton hide-if-no-js" name="save" value="<?php esc_attr_e( 'Save all changes' ); ?>" />
 	</p>
 	</form>
 	</div>
 
 <?php
-	include('admin-footer.php');
+	include('./admin-footer.php');
 
 } else {