X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..3194d1bb103c2d8db4f44feeced5e58ee2756658:/wp-admin/media-upload.php

diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index cb871c0c..0c9c5e25 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -15,8 +15,9 @@ if ( ! isset( $_GET['inline'] ) )
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if (!current_user_can('upload_files'))
-	wp_die(__('You do not have permission to upload files.'));
+if ( ! current_user_can( 'upload_files' ) ) {
+	wp_die( __( 'You do not have permission to upload files.' ), 403 );
+}
 
 wp_enqueue_script('plupload-handlers');
 wp_enqueue_script('image-edit');
@@ -31,70 +32,81 @@ $ID = isset($ID) ? (int) $ID : 0;
 $post_id = isset($post_id)? (int) $post_id : 0;
 
 // Require an ID for the edit screen.
-if ( isset($action) && $action == 'edit' && !$ID )
-	wp_die( __( 'Cheatin’ uh?' ) );
+if ( isset( $action ) && $action == 'edit' && !$ID ) {
+	wp_die(
+		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<p>' . __( 'Invalid item ID.' ) . '</p>',
+		403
+	);
+}
 
-	if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
-		wp_die( __( 'Cheatin&#8217; uh?' ) );
+if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) {
+	wp_die(
+		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
+		403
+	);
+}
 
-	// Upload type: image, video, file, ..?
-	if ( isset($_GET['type']) ) {
-		$type = strval($_GET['type']);
-	} else {
-		/**
-		 * Filter the default media upload type in the legacy (pre-3.5.0) media popup.
-		 *
-		 * @since 2.5.0
-		 *
-		 * @param string $type The default media upload type. Possible values include
-		 *                     'image', 'audio', 'video', 'file', etc. Default 'file'.
-		 */
-		$type = apply_filters( 'media_upload_default_type', 'file' );
-	}
+// Upload type: image, video, file, ..?
+if ( isset($_GET['type']) ) {
+	$type = strval($_GET['type']);
+} else {
+	/**
+	 * Filter the default media upload type in the legacy (pre-3.5.0) media popup.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @param string $type The default media upload type. Possible values include
+	 *                     'image', 'audio', 'video', 'file', etc. Default 'file'.
+	 */
+	$type = apply_filters( 'media_upload_default_type', 'file' );
+}
 
-	// Tab: gallery, library, or type-specific.
-	if ( isset($_GET['tab']) ) {
-		$tab = strval($_GET['tab']);
-	} else {
-		/**
-		 * Filter the default tab in the legacy (pre-3.5.0) media popup.
-		 *
-		 * @since 2.5.0
-		 *
-		 * @param string $type The default media popup tab. Default 'type' (From Computer).
-		 */
-		$tab = apply_filters( 'media_upload_default_tab', 'type' );
-	}
+// Tab: gallery, library, or type-specific.
+if ( isset($_GET['tab']) ) {
+	$tab = strval($_GET['tab']);
+} else {
+	/**
+	 * Filter the default tab in the legacy (pre-3.5.0) media popup.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @param string $type The default media popup tab. Default 'type' (From Computer).
+	 */
+	$tab = apply_filters( 'media_upload_default_tab', 'type' );
+}
 
-	$body_id = 'media-upload';
+$body_id = 'media-upload';
+
+// Let the action code decide how to handle the request.
+if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
+	/**
+	 * Fires inside specific upload-type views in the legacy (pre-3.5.0)
+	 * media popup based on the current tab.
+	 *
+	 * The dynamic portion of the hook name, `$type`, refers to the specific
+	 * media upload type. Possible values include 'image', 'audio', 'video',
+	 * 'file', etc.
+	 *
+	 * The hook only fires if the current `$tab` is 'type' (From Computer),
+	 * 'type_url' (From URL), or, if the tab does not exist (i.e., has not
+	 * been registered via the {@see 'media_upload_tabs'} filter.
+	 *
+	 * @since 2.5.0
+	 */
+	do_action( "media_upload_$type" );
+} else {
+	/**
+	 * Fires inside limited and specific upload-tab views in the legacy
+	 * (pre-3.5.0) media popup.
+	 *
+	 * The dynamic portion of the hook name, `$tab`, refers to the specific
+	 * media upload tab. Possible values include 'library' (Media Library),
+	 * or any custom tab registered via the {@see 'media_upload_tabs'} filter.
+	 *
+	 * @since 2.5.0
+	 */
+	do_action( "media_upload_$tab" );
+}
 
-	// Let the action code decide how to handle the request.
-	if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
-		/**
-		 * Fires inside specific upload-type views in the legacy (pre-3.5.0)
-		 * media popup based on the current tab.
-		 *
-		 * The dynamic portion of the hook name, $type, refers to the specific
-		 * media upload type. Possible values include 'image', 'audio', 'video',
-		 * 'file', etc.
-		 *
-		 * The hook only fires if the current $tab is 'type' (From Computer),
-		 * 'type_url' (From URL), or, if the tab does not exist (i.e., has not
-		 * been registered via the 'media_upload_tabs' filter.
-		 *
-		 * @since 2.5.0
-		 */
-		do_action( "media_upload_$type" );
-	} else {
-		/**
-		 * Fires inside limited and specific upload-tab views in the legacy
-		 * (pre-3.5.0) media popup.
-		 *
-		 * The dynamic portion of the hook name, $tab, refers to the specific
-		 * media upload tab. Possible values include 'library' (Media Library),
-		 * or any custom tab registered via the 'media_upload_tabs' filter.
-		 *
-		 * @since 2.5.0
-		 */
-		do_action( "media_upload_$tab" );
-	}