diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-admin/includes/media.php
--- a/wp/wp-admin/includes/media.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/includes/media.php	Tue Dec 15 13:49:49 2020 +0100
@@ -11,11 +11,11 @@
  *
  * @since 2.5.0
  *
- * @return array default tabs
+ * @return string[] Default tabs.
  */
 function media_upload_tabs() {
 	$_default_tabs = array(
-		'type'     => __( 'From Computer' ), // handler action suffix => tab text
+		'type'     => __( 'From Computer' ), // Handler action suffix => tab text.
 		'type_url' => __( 'From URL' ),
 		'gallery'  => __( 'Gallery' ),
 		'library'  => __( 'Media Library' ),
@@ -26,7 +26,7 @@
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param array $_default_tabs An array of media tabs.
+	 * @param string[] $_default_tabs An array of media tabs.
 	 */
 	return apply_filters( 'media_upload_tabs', $_default_tabs );
 }
@@ -60,6 +60,7 @@
 		return $tabs;
 	}
 
+	/* translators: %s: Number of attachments. */
 	$tabs['gallery'] = sprintf( __( 'Gallery (%s)' ), "<span id='attachments-count'>$attachments</span>" );
 
 	return $tabs;
@@ -79,6 +80,7 @@
 
 	if ( ! empty( $tabs ) ) {
 		echo "<ul id='sidemenu'>\n";
+
 		if ( isset( $redir_tab ) && array_key_exists( $redir_tab, $tabs ) ) {
 			$current = $redir_tab;
 		} elseif ( isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $tabs ) ) {
@@ -107,6 +109,7 @@
 			$link = "<a href='" . esc_url( $href ) . "'$class>$text</a>";
 			echo "\t<li id='" . esc_attr( "tab-$callback" ) . "'>$link</li>\n";
 		}
+
 		echo "</ul>\n";
 	}
 }
@@ -116,7 +119,7 @@
  *
  * @since 2.5.0
  *
- * @param int          $id      Image attachment id.
+ * @param int          $id      Image attachment ID.
  * @param string       $caption Image caption.
  * @param string       $title   Image title attribute.
  * @param string       $align   Image CSS alignment property.
@@ -151,7 +154,7 @@
 	 * @since 2.5.0
 	 *
 	 * @param string       $html    The image HTML markup to send.
-	 * @param int          $id      The attachment id.
+	 * @param int          $id      The attachment ID.
 	 * @param string       $caption The image caption.
 	 * @param string       $title   The image title.
 	 * @param string       $align   The image alignment.
@@ -166,7 +169,7 @@
 }
 
 /**
- * Adds image shortcode with caption to editor
+ * Adds image shortcode with caption to editor.
  *
  * @since 2.6.0
  *
@@ -205,7 +208,7 @@
 	 *
 	 * @since 2.6.0
 	 *
-	 * @param bool $bool Whether to disable appending captions. Returning true to the filter
+	 * @param bool $bool Whether to disable appending captions. Returning true from the filter
 	 *                   will disable captions. Default empty string.
 	 */
 	if ( empty( $caption ) || apply_filters( 'disable_captions', '' ) ) {
@@ -223,7 +226,7 @@
 	$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>.
+	// 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 );
@@ -245,7 +248,7 @@
 }
 
 /**
- * Private preg_replace callback used in image_add_caption()
+ * Private preg_replace callback used in image_add_caption().
  *
  * @access private
  * @since 3.4.0
@@ -256,7 +259,7 @@
 }
 
 /**
- * Adds image html to editor
+ * Adds image HTML to editor.
  *
  * @since 2.5.0
  *
@@ -264,30 +267,31 @@
  */
 function media_send_to_editor( $html ) {
 	?>
-<script type="text/javascript">
-var win = window.dialogArguments || opener || parent || top;
-win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
-</script>
+	<script type="text/javascript">
+	var win = window.dialogArguments || opener || parent || top;
+	win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
+	</script>
 	<?php
 	exit;
 }
 
 /**
- * Save a file submitted from a POST request and create an attachment post for it.
+ * Saves a file submitted from a POST request and create an attachment post for it.
  *
  * @since 2.5.0
  *
  * @param string $file_id   Index of the `$_FILES` array that the file was sent. Required.
  * @param int    $post_id   The post ID of a post to attach the media item to. Required, but can
  *                          be set to 0, creating a media item that has no relationship to a post.
- * @param array  $post_data Overwrite some of the attachment. Optional.
- * @param array  $overrides Override the wp_handle_upload() behavior. Optional.
+ * @param array  $post_data Optional. Overwrite some of the attachment.
+ * @param array  $overrides Optional. Override the wp_handle_upload() behavior.
  * @return int|WP_Error ID of the attachment or a WP_Error object on failure.
  */
 function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false ) ) {
-
 	$time = current_time( 'mysql' );
-	if ( $post = get_post( $post_id ) ) {
+	$post = get_post( $post_id );
+
+	if ( $post ) {
 		// The post date doesn't usually matter for pages, so don't backdate this upload.
 		if ( 'page' !== $post->post_type && substr( $post->post_date, 0, 4 ) > 0 ) {
 			$time = $post->post_date;
@@ -321,22 +325,22 @@
 		if ( ! empty( $title ) ) {
 
 			if ( ! empty( $meta['album'] ) && ! empty( $meta['artist'] ) ) {
-				/* translators: 1: audio track title, 2: album title, 3: artist name */
+				/* translators: 1: Audio track title, 2: Album title, 3: Artist name. */
 				$content .= sprintf( __( '"%1$s" from %2$s by %3$s.' ), $title, $meta['album'], $meta['artist'] );
 			} elseif ( ! empty( $meta['album'] ) ) {
-				/* translators: 1: audio track title, 2: album title */
+				/* translators: 1: Audio track title, 2: Album title. */
 				$content .= sprintf( __( '"%1$s" from %2$s.' ), $title, $meta['album'] );
 			} elseif ( ! empty( $meta['artist'] ) ) {
-				/* translators: 1: audio track title, 2: artist name */
+				/* translators: 1: Audio track title, 2: Artist name. */
 				$content .= sprintf( __( '"%1$s" by %2$s.' ), $title, $meta['artist'] );
 			} else {
-				/* translators: 1: audio track title */
+				/* translators: %s: Audio track title. */
 				$content .= sprintf( __( '"%s".' ), $title );
 			}
 		} elseif ( ! empty( $meta['album'] ) ) {
 
 			if ( ! empty( $meta['artist'] ) ) {
-				/* translators: 1: audio album title, 2: artist name */
+				/* translators: 1: Audio album title, 2: Artist name. */
 				$content .= sprintf( __( '%1$s by %2$s.' ), $meta['album'], $meta['artist'] );
 			} else {
 				$content .= $meta['album'] . '.';
@@ -348,38 +352,43 @@
 		}
 
 		if ( ! empty( $meta['year'] ) ) {
-			/* translators: Audio file track information. %d: Year of audio track release */
+			/* translators: Audio file track information. %d: Year of audio track release. */
 			$content .= ' ' . sprintf( __( 'Released: %d.' ), $meta['year'] );
 		}
 
 		if ( ! empty( $meta['track_number'] ) ) {
 			$track_number = explode( '/', $meta['track_number'] );
+
 			if ( isset( $track_number[1] ) ) {
-				/* translators: Audio file track information. 1: Audio track number, 2: Total audio tracks */
+				/* translators: Audio file track information. 1: Audio track number, 2: Total audio tracks. */
 				$content .= ' ' . sprintf( __( 'Track %1$s of %2$s.' ), number_format_i18n( $track_number[0] ), number_format_i18n( $track_number[1] ) );
 			} else {
-				/* translators: Audio file track information. %s: Audio track number */
+				/* translators: Audio file track information. %s: Audio track number. */
 				$content .= ' ' . sprintf( __( 'Track %s.' ), number_format_i18n( $track_number[0] ) );
 			}
 		}
 
 		if ( ! empty( $meta['genre'] ) ) {
-			/* translators: Audio file genre information. %s: Audio genre name */
+			/* translators: Audio file genre information. %s: Audio genre name. */
 			$content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
 		}
 
 		// Use image exif/iptc data for title and caption defaults if possible.
-	} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = wp_read_image_metadata( $file ) ) {
-		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
-			$title = $image_meta['title'];
-		}
-
-		if ( trim( $image_meta['caption'] ) ) {
-			$excerpt = $image_meta['caption'];
+	} elseif ( 0 === strpos( $type, 'image/' ) ) {
+		$image_meta = wp_read_image_metadata( $file );
+
+		if ( $image_meta ) {
+			if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
+				$title = $image_meta['title'];
+			}
+
+			if ( trim( $image_meta['caption'] ) ) {
+				$excerpt = $image_meta['caption'];
+			}
 		}
 	}
 
-	// Construct the attachment array
+	// Construct the attachment array.
 	$attachment = array_merge(
 		array(
 			'post_mime_type' => $type,
@@ -395,38 +404,50 @@
 	// This should never be set as it would then overwrite an existing attachment.
 	unset( $attachment['ID'] );
 
-	// Save the data
-	$id = wp_insert_attachment( $attachment, $file, $post_id, true );
-	if ( ! is_wp_error( $id ) ) {
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+	// Save the data.
+	$attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
+
+	if ( ! is_wp_error( $attachment_id ) ) {
+		// Set a custom header with the attachment_id.
+		// Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+		if ( ! headers_sent() ) {
+			header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
+		}
+
+		// The image sub-sizes are created during wp_generate_attachment_metadata().
+		// This is generally slow and may cause timeouts or out of memory errors.
+		wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
 	}
 
-	return $id;
-
+	return $attachment_id;
 }
 
 /**
  * Handles a side-loaded file in the same way as an uploaded file is handled by media_handle_upload().
  *
  * @since 2.6.0
+ * @since 5.3.0 The `$post_id` parameter was made optional.
  *
  * @param array  $file_array Array similar to a `$_FILES` upload array.
- * @param int    $post_id    The post ID the media is associated with.
+ * @param int    $post_id    Optional. The post ID the media is associated with.
  * @param string $desc       Optional. Description of the side-loaded file. Default null.
  * @param array  $post_data  Optional. Post data to override. Default empty array.
- * @return int|object The ID of the attachment or a WP_Error on failure.
+ * @return int|WP_Error The ID of the attachment or a WP_Error on failure.
  */
-function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data = array() ) {
+function media_handle_sideload( $file_array, $post_id = 0, $desc = null, $post_data = array() ) {
 	$overrides = array( 'test_form' => false );
 
 	$time = current_time( 'mysql' );
-	if ( $post = get_post( $post_id ) ) {
+	$post = get_post( $post_id );
+
+	if ( $post ) {
 		if ( substr( $post->post_date, 0, 4 ) > 0 ) {
 			$time = $post->post_date;
 		}
 	}
 
 	$file = wp_handle_sideload( $file_array, $overrides, $time );
+
 	if ( isset( $file['error'] ) ) {
 		return new WP_Error( 'upload_error', $file['error'] );
 	}
@@ -438,10 +459,13 @@
 	$content = '';
 
 	// Use image exif/iptc data for title and caption defaults if possible.
-	if ( $image_meta = wp_read_image_metadata( $file ) ) {
+	$image_meta = wp_read_image_metadata( $file );
+
+	if ( $image_meta ) {
 		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
 			$title = $image_meta['title'];
 		}
+
 		if ( trim( $image_meta['caption'] ) ) {
 			$content = $image_meta['caption'];
 		}
@@ -466,43 +490,49 @@
 	// This should never be set as it would then overwrite an existing attachment.
 	unset( $attachment['ID'] );
 
-	// Save the attachment metadata
-	$id = wp_insert_attachment( $attachment, $file, $post_id, true );
-	if ( ! is_wp_error( $id ) ) {
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+	// Save the attachment metadata.
+	$attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
+
+	if ( ! is_wp_error( $attachment_id ) ) {
+		wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
 	}
 
-	return $id;
+	return $attachment_id;
 }
 
 /**
- * Adds the iframe to display content for the media upload page
+ * Outputs the iframe to display the media upload page.
  *
  * @since 2.5.0
+ * @since 5.3.0 Formalized the existing and already documented `...$args` parameter
+ *              by adding it to the function signature.
  *
  * @global int $body_id
  *
- * @param string|callable $content_func
+ * @param callable $content_func Function that outputs the content.
+ * @param mixed    ...$args      Optional additional parameters to pass to the callback function when it's called.
  */
-function wp_iframe( $content_func /* ... */ ) {
+function wp_iframe( $content_func, ...$args ) {
 	_wp_admin_html_begin();
 	?>
-<title><?php bloginfo( 'name' ); ?> &rsaquo; <?php _e( 'Uploads' ); ?> &#8212; <?php _e( 'WordPress' ); ?></title>
+	<title><?php bloginfo( 'name' ); ?> &rsaquo; <?php _e( 'Uploads' ); ?> &#8212; <?php _e( 'WordPress' ); ?></title>
 	<?php
 
 	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' ) )
-	|| ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) ) {
+	// Check callback name for 'media'.
+	if (
+		( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) ) ||
+		( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) )
+	) {
 		wp_enqueue_style( 'deprecated-media' );
 	}
-	wp_enqueue_style( 'ie' );
+
 	?>
-<script type="text/javascript">
-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 ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
-isRtl = <?php echo (int) is_rtl(); ?>;
-</script>
+	<script type="text/javascript">
+	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 ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
+	isRtl = <?php echo (int) is_rtl(); ?>;
+	</script>
 	<?php
 	/** This action is documented in wp-admin/admin-header.php */
 	do_action( 'admin_enqueue_scripts', 'media-upload-popup' );
@@ -512,7 +542,7 @@
 	 *
 	 * @since 2.9.0
 	 */
-	do_action( 'admin_print_styles-media-upload-popup' );
+	do_action( 'admin_print_styles-media-upload-popup' );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
 	/** This action is documented in wp-admin/admin-header.php */
 	do_action( 'admin_print_styles' );
@@ -522,7 +552,7 @@
 	 *
 	 * @since 2.9.0
 	 */
-	do_action( 'admin_print_scripts-media-upload-popup' );
+	do_action( 'admin_print_scripts-media-upload-popup' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
 	/** This action is documented in wp-admin/admin-header.php */
 	do_action( 'admin_print_scripts' );
@@ -533,7 +563,7 @@
 	 *
 	 * @since 2.9.0
 	 */
-	do_action( 'admin_head-media-upload-popup' );
+	do_action( 'admin_head-media-upload-popup' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
 	/** This action is documented in wp-admin/admin-header.php */
 	do_action( 'admin_head' );
@@ -554,26 +584,28 @@
 	}
 
 	$body_id_attr = '';
+
 	if ( isset( $GLOBALS['body_id'] ) ) {
 		$body_id_attr = ' id="' . $GLOBALS['body_id'] . '"';
 	}
+
 	?>
-</head>
-<body<?php echo $body_id_attr; ?> class="wp-core-ui no-js">
-<script type="text/javascript">
-document.body.className = document.body.className.replace('no-js', 'js');
-</script>
+	</head>
+	<body<?php echo $body_id_attr; ?> class="wp-core-ui 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 );
+
 	call_user_func_array( $content_func, $args );
 
 	/** This action is documented in wp-admin/admin-footer.php */
 	do_action( 'admin_print_footer_scripts' );
+
 	?>
-<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
-</body>
-</html>
+	<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
+	</body>
+	</html>
 	<?php
 }
 
@@ -584,8 +616,6 @@
  *
  * @global int $post_ID
  *
- * @staticvar int $instance
- *
  * @param string $editor_id
  */
 function media_buttons( $editor_id = 'content' ) {
@@ -593,25 +623,24 @@
 	$instance++;
 
 	$post = get_post();
+
 	if ( ! $post && ! empty( $GLOBALS['post_ID'] ) ) {
 		$post = $GLOBALS['post_ID'];
 	}
 
-	wp_enqueue_media(
-		array(
-			'post' => $post,
-		)
-	);
+	wp_enqueue_media( array( 'post' => $post ) );
 
 	$img = '<span class="wp-media-buttons-icon"></span> ';
 
-	$id_attribute = $instance === 1 ? ' id="insert-media-button"' : '';
+	$id_attribute = 1 === $instance ? ' id="insert-media-button"' : '';
+
 	printf(
 		'<button type="button"%s class="button insert-media add_media" data-editor="%s">%s</button>',
 		$id_attribute,
 		esc_attr( $editor_id ),
 		$img . __( 'Add Media' )
 	);
+
 	/**
 	 * Filters the legacy (pre-3.5.0) media buttons.
 	 *
@@ -622,7 +651,7 @@
 	 *
 	 * @param string $string Media buttons context. Default empty.
 	 */
-	$legacy_filter = apply_filters( 'media_buttons_context', '' );
+	$legacy_filter = apply_filters_deprecated( 'media_buttons_context', array( '' ), '3.5.0', 'media_buttons' );
 
 	if ( $legacy_filter ) {
 		// #WP22559. Close <a> if a plugin started by closing <a> to open their own <a> tag.
@@ -636,7 +665,7 @@
 /**
  * @global int $post_ID
  * @param string $type
- * @param int $post_id
+ * @param int    $post_id
  * @param string $tab
  * @return string
  */
@@ -649,7 +678,7 @@
 
 	$upload_iframe_src = add_query_arg( 'post_id', (int) $post_id, admin_url( 'media-upload.php' ) );
 
-	if ( $type && 'media' != $type ) {
+	if ( $type && 'media' !== $type ) {
 		$upload_iframe_src = add_query_arg( 'type', $type, $upload_iframe_src );
 	}
 
@@ -691,7 +720,8 @@
 
 	if ( ! empty( $_POST['attachments'] ) ) {
 		foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
-			$post = $_post = get_post( $attachment_id, ARRAY_A );
+			$post  = get_post( $attachment_id, ARRAY_A );
+			$_post = $post;
 
 			if ( ! current_user_can( 'edit_post', $attachment_id ) ) {
 				continue;
@@ -700,12 +730,15 @@
 			if ( isset( $attachment['post_content'] ) ) {
 				$post['post_content'] = $attachment['post_content'];
 			}
+
 			if ( isset( $attachment['post_title'] ) ) {
 				$post['post_title'] = $attachment['post_title'];
 			}
+
 			if ( isset( $attachment['post_excerpt'] ) ) {
 				$post['post_excerpt'] = $attachment['post_excerpt'];
 			}
+
 			if ( isset( $attachment['menu_order'] ) ) {
 				$post['menu_order'] = $attachment['menu_order'];
 			}
@@ -730,10 +763,11 @@
 
 			if ( isset( $attachment['image_alt'] ) ) {
 				$image_alt = wp_unslash( $attachment['image_alt'] );
-				if ( $image_alt != get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) {
+
+				if ( get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) !== $image_alt ) {
 					$image_alt = wp_strip_all_tags( $image_alt, true );
 
-					// Update_meta expects slashed.
+					// update_post_meta() expects slashed.
 					update_post_meta( $attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
 				}
 			}
@@ -762,18 +796,21 @@
 		win.tb_remove();
 		</script>
 		<?php
+
 		exit;
 	}
 
 	if ( isset( $send_id ) ) {
 		$attachment = wp_unslash( $_POST['attachments'][ $send_id ] );
-
-		$html = isset( $attachment['post_title'] ) ? $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'] ) {
 				$rel = " rel='attachment wp-att-" . esc_attr( $send_id ) . "'";
 			}
+
 			$html = "<a href='{$attachment['url']}'$rel>$html</a>";
 		}
 
@@ -789,6 +826,7 @@
 		 * @param array  $attachment Array of attachment metadata.
 		 */
 		$html = apply_filters( 'media_send_to_editor', $html, $send_id, $attachment );
+
 		return media_send_to_editor( $html );
 	}
 
@@ -808,9 +846,10 @@
 
 	if ( isset( $_POST['html-upload'] ) && ! empty( $_FILES ) ) {
 		check_admin_referer( 'media-form' );
-		// Upload File button was clicked
+		// 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;
@@ -819,11 +858,12 @@
 
 	if ( ! empty( $_POST['insertonlybutton'] ) ) {
 		$src = $_POST['src'];
+
 		if ( ! empty( $src ) && ! strpos( $src, '://' ) ) {
 			$src = "http://$src";
 		}
 
-		if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) {
+		if ( isset( $_POST['media_type'] ) && 'image' !== $_POST['media_type'] ) {
 			$title = esc_html( wp_unslash( $_POST['title'] ) );
 			if ( empty( $title ) ) {
 				$title = esc_html( wp_basename( $src ) );
@@ -834,9 +874,13 @@
 			}
 
 			$type = 'file';
-			if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
-				&& ( 'audio' == $ext_type || 'video' == $ext_type ) ) {
+			$ext  = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src );
+
+			if ( $ext ) {
+				$ext_type = wp_ext2type( $ext );
+				if ( 'audio' === $ext_type || 'video' === $ext_type ) {
 					$type = $ext_type;
+				}
 			}
 
 			/**
@@ -855,10 +899,12 @@
 		} else {
 			$align = '';
 			$alt   = esc_attr( wp_unslash( $_POST['alt'] ) );
+
 			if ( isset( $_POST['align'] ) ) {
 				$align = esc_attr( wp_unslash( $_POST['align'] ) );
 				$class = " class='align$align'";
 			}
+
 			if ( ! empty( $src ) ) {
 				$html = "<img src='" . esc_url( $src ) . "' alt='$alt'$class />";
 			}
@@ -883,6 +929,7 @@
 	if ( isset( $_POST['save'] ) ) {
 		$errors['upload_notice'] = __( 'Saved.' );
 		wp_enqueue_script( 'admin-gallery' );
+
 		return wp_iframe( 'media_upload_gallery_form', $errors );
 
 	} elseif ( ! empty( $_POST ) ) {
@@ -891,16 +938,19 @@
 		if ( is_string( $return ) ) {
 			return $return;
 		}
+
 		if ( is_array( $return ) ) {
 			$errors = $return;
 		}
 	}
 
-	if ( isset( $_GET['tab'] ) && $_GET['tab'] == 'type_url' ) {
+	if ( isset( $_GET['tab'] ) && 'type_url' === $_GET['tab'] ) {
 		$type = 'image';
-		if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) {
+
+		if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ), true ) ) {
 			$type = $_GET['type'];
 		}
+
 		return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
 	}
 
@@ -913,20 +963,25 @@
  * @since 2.6.0
  * @since 4.2.0 Introduced the `$return` parameter.
  * @since 4.8.0 Introduced the 'id' option within the `$return` parameter.
+ * @since 5.3.0 The `$post_id` parameter was made optional.
+ * @since 5.4.0 The original URL of the attachment is stored in the `_source_url`
+ *              post meta value.
  *
  * @param string $file    The URL of the image to download.
- * @param int    $post_id The post ID the media is to be associated with.
+ * @param int    $post_id Optional. The post ID the media is to be associated with.
  * @param string $desc    Optional. Description of the image.
- * @param string $return  Optional. Accepts 'html' (image tag html) or 'src' (URL), or 'id' (attachment ID). Default 'html'.
+ * @param string $return  Optional. Accepts 'html' (image tag html) or 'src' (URL),
+ *                        or 'id' (attachment ID). Default 'html'.
  * @return string|WP_Error Populated HTML img tag on success, WP_Error object otherwise.
  */
-function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) {
+function media_sideload_image( $file, $post_id = 0, $desc = null, $return = 'html' ) {
 	if ( ! empty( $file ) ) {
 
 		// Set variables for storage, fix file filename for query strings.
 		preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
+
 		if ( ! $matches ) {
-			return new WP_Error( 'image_sideload_failed', __( 'Invalid image URL' ) );
+			return new WP_Error( 'image_sideload_failed', __( 'Invalid image URL.' ) );
 		}
 
 		$file_array         = array();
@@ -947,8 +1002,13 @@
 		if ( is_wp_error( $id ) ) {
 			@unlink( $file_array['tmp_name'] );
 			return $id;
-			// If attachment id was requested, return it early.
-		} elseif ( $return === 'id' ) {
+		}
+
+		// Store the original attachment source in meta.
+		add_post_meta( $id, '_source_url', $file );
+
+		// If attachment ID was requested, return it.
+		if ( 'id' === $return ) {
 			return $id;
 		}
 
@@ -957,12 +1017,13 @@
 
 	// Finally, check to make sure the file has been saved, then return the HTML.
 	if ( ! empty( $src ) ) {
-		if ( $return === 'src' ) {
+		if ( 'src' === $return ) {
 			return $src;
 		}
 
 		$alt  = isset( $desc ) ? esc_attr( $desc ) : '';
 		$html = "<img src='$src' alt='$alt' />";
+
 		return $html;
 	} else {
 		return new WP_Error( 'image_sideload_failed' );
@@ -985,6 +1046,7 @@
 		if ( is_string( $return ) ) {
 			return $return;
 		}
+
 		if ( is_array( $return ) ) {
 			$errors = $return;
 		}
@@ -1003,6 +1065,7 @@
  */
 function media_upload_library() {
 	$errors = array();
+
 	if ( ! empty( $_POST ) ) {
 		$return = media_upload_form_handler();
 
@@ -1023,7 +1086,7 @@
  * @since 2.7.0
  *
  * @param WP_Post $post
- * @param string $checked
+ * @param string  $checked
  * @return string
  */
 function image_align_input_fields( $post, $checked = '' ) {
@@ -1038,17 +1101,20 @@
 		'center' => __( 'Center' ),
 		'right'  => __( 'Right' ),
 	);
+
 	if ( ! array_key_exists( (string) $checked, $alignments ) ) {
 		$checked = 'none';
 	}
 
 	$out = array();
+
 	foreach ( $alignments as $name => $label ) {
 		$name  = esc_attr( $name );
 		$out[] = "<input type='radio' name='attachments[{$post->ID}][align]' id='image-align-{$name}-{$post->ID}' value='$name'" .
 			( $checked == $name ? " checked='checked'" : '' ) .
 			" /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>$label</label>";
 	}
+
 	return join( "\n", $out );
 }
 
@@ -1057,7 +1123,7 @@
  *
  * @since 2.7.0
  *
- * @param WP_Post $post
+ * @param WP_Post     $post
  * @param bool|string $check
  * @return array
  */
@@ -1067,8 +1133,8 @@
 	 *
 	 * @since 3.3.0
 	 *
-	 * @param array $size_names Array of image sizes and their names. Default values
-	 *                          include 'Thumbnail', 'Medium', 'Large', 'Full Size'.
+	 * @param string[] $size_names Array of image size labels keyed by their name. Default values
+	 *                             include 'Thumbnail', 'Medium', 'Large', and 'Full Size'.
 	 */
 	$size_names = apply_filters(
 		'image_size_names_choose',
@@ -1083,6 +1149,7 @@
 	if ( empty( $check ) ) {
 		$check = get_user_setting( 'imgsize', 'medium' );
 	}
+
 	$out = array();
 
 	foreach ( $size_names as $size => $label ) {
@@ -1090,7 +1157,7 @@
 		$checked  = '';
 
 		// Is this size selectable?
-		$enabled = ( $downsize[3] || 'full' == $size );
+		$enabled = ( $downsize[3] || 'full' === $size );
 		$css_id  = "image-size-{$size}-{$post->ID}";
 
 		// If this size is the default but that's not available, don't select it.
@@ -1100,7 +1167,7 @@
 			} else {
 				$check = '';
 			}
-		} elseif ( ! $check && $enabled && 'thumbnail' != $size ) {
+		} elseif ( ! $check && $enabled && 'thumbnail' !== $size ) {
 			/*
 			 * If $check is not enabled, default to the first available size
 			 * that's bigger than a thumbnail.
@@ -1135,7 +1202,7 @@
  * @since 2.7.0
  *
  * @param WP_Post $post
- * @param string $url_type
+ * @param string  $url_type
  * @return string
  */
 function image_link_input_fields( $post, $url_type = '' ) {
@@ -1148,9 +1215,10 @@
 	}
 
 	$url = '';
-	if ( $url_type == 'file' ) {
+
+	if ( 'file' === $url_type ) {
 		$url = $file;
-	} elseif ( $url_type == 'post' ) {
+	} elseif ( 'post' === $url_type ) {
 		$url = $link;
 	}
 
@@ -1182,7 +1250,7 @@
  *
  * @since 2.5.0
  *
- * @param array $form_fields
+ * @param array  $form_fields
  * @param object $post
  * @return array
  */
@@ -1205,7 +1273,7 @@
 }
 
 /**
- * Retrieves the post non-image attachment fields to edito form fields.
+ * Retrieves the post non-image attachment fields to edit form fields.
  *
  * @since 2.8.0
  *
@@ -1232,7 +1300,7 @@
  * @return array Filtered attachment post object.
  */
 function image_attachment_fields_to_save( $post, $attachment ) {
-	if ( substr( $post['post_mime_type'], 0, 5 ) == 'image' ) {
+	if ( 'image' === substr( $post['post_mime_type'], 0, 5 ) ) {
 		if ( strlen( trim( $post['post_title'] ) ) == 0 ) {
 			$attachment_url                           = ( isset( $post['attachment_url'] ) ) ? $post['attachment_url'] : $post['guid'];
 			$post['post_title']                       = preg_replace( '/\.\w+$/', '', wp_basename( $attachment_url ) );
@@ -1248,19 +1316,20 @@
  *
  * @since 2.5.0
  *
- * @param string $html
+ * @param string  $html
  * @param integer $attachment_id
- * @param array $attachment
+ * @param array   $attachment
  * @return string
  */
 function image_media_send_to_editor( $html, $attachment_id, $attachment ) {
 	$post = get_post( $attachment_id );
-	if ( substr( $post->post_mime_type, 0, 5 ) == 'image' ) {
+
+	if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) {
 		$url   = $attachment['url'];
 		$align = ! empty( $attachment['align'] ) ? $attachment['align'] : 'none';
 		$size  = ! empty( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium';
 		$alt   = ! empty( $attachment['image_alt'] ) ? $attachment['image_alt'] : '';
-		$rel   = ( strpos( $url, 'attachment_id' ) || $url === get_attachment_link( $attachment_id ) );
+		$rel   = ( strpos( $url, 'attachment_id' ) || get_attachment_link( $attachment_id ) === $url );
 
 		return get_image_send_to_editor( $attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt );
 	}
@@ -1274,13 +1343,14 @@
  * @since 2.5.0
  *
  * @param WP_Post $post
- * @param array $errors
+ * @param array   $errors
  * @return array
  */
 function get_attachment_fields_to_edit( $post, $errors = null ) {
 	if ( is_int( $post ) ) {
 		$post = get_post( $post );
 	}
+
 	if ( is_array( $post ) ) {
 		$post = new WP_Post( (object) $post );
 	}
@@ -1326,17 +1396,21 @@
 
 	foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
 		$t = (array) get_taxonomy( $taxonomy );
+
 		if ( ! $t['public'] || ! $t['show_ui'] ) {
 			continue;
 		}
+
 		if ( empty( $t['label'] ) ) {
 			$t['label'] = $taxonomy;
 		}
+
 		if ( empty( $t['args'] ) ) {
 			$t['args'] = array();
 		}
 
 		$terms = get_object_term_cache( $post->ID, $taxonomy );
+
 		if ( false === $terms ) {
 			$terms = wp_get_object_terms( $post->ID, $taxonomy, $t['args'] );
 		}
@@ -1346,18 +1420,24 @@
 		foreach ( $terms as $term ) {
 			$values[] = $term->slug;
 		}
+
 		$t['value'] = join( ', ', $values );
 
 		$form_fields[ $taxonomy ] = $t;
 	}
 
-	// Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
-	// The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing )
+	/*
+	 * Merge default fields with their errors, so any key passed with the error
+	 * (e.g. 'error', 'helps', 'value') will replace the default.
+	 * The recursive merge is easily traversed with array casting:
+	 * foreach ( (array) $things as $thing )
+	 */
 	$form_fields = array_merge_recursive( $form_fields, (array) $errors );
 
 	// This was formerly in image_attachment_fields_to_edit().
-	if ( substr( $post->post_mime_type, 0, 5 ) == 'image' ) {
+	if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) {
 		$alt = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
+
 		if ( empty( $alt ) ) {
 			$alt = '';
 		}
@@ -1404,17 +1484,19 @@
  *
  * @since 2.5.0
  *
- * @global WP_Query $wp_the_query
+ * @global WP_Query $wp_the_query WordPress Query object.
  *
- * @param int $post_id Optional. Post ID.
- * @param array $errors Errors for attachment, if any.
+ * @param int   $post_id Optional. Post ID.
+ * @param array $errors  Errors for attachment, if any.
  * @return string
  */
 function get_media_items( $post_id, $errors ) {
 	$attachments = array();
+
 	if ( $post_id ) {
 		$post = get_post( $post_id );
-		if ( $post && $post->post_type == 'attachment' ) {
+
+		if ( $post && 'attachment' === $post->post_type ) {
 			$attachments = array( $post->ID => $post );
 		} else {
 			$attachments = get_children(
@@ -1436,10 +1518,13 @@
 
 	$output = '';
 	foreach ( (array) $attachments as $id => $attachment ) {
-		if ( $attachment->post_status == 'trash' ) {
+		if ( 'trash' === $attachment->post_status ) {
 			continue;
 		}
-		if ( $item = get_media_item( $id, array( 'errors' => isset( $errors[ $id ] ) ? $errors[ $id ] : null ) ) ) {
+
+		$item = get_media_item( $id, array( 'errors' => isset( $errors[ $id ] ) ? $errors[ $id ] : null ) );
+
+		if ( $item ) {
 			$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>";
 		}
 	}
@@ -1454,17 +1539,22 @@
  *
  * @global string $redir_tab
  *
- * @param int $attachment_id Attachment ID for modification.
- * @param string|array $args Optional. Override defaults.
+ * @param int          $attachment_id Attachment ID for modification.
+ * @param string|array $args          Optional. Override defaults.
  * @return string HTML form for attachment.
  */
 function get_media_item( $attachment_id, $args = null ) {
 	global $redir_tab;
 
-	if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) ) {
-		$thumb_url = $thumb_url[0];
-	} else {
-		$thumb_url = false;
+	$thumb_url     = false;
+	$attachment_id = intval( $attachment_id );
+
+	if ( $attachment_id ) {
+		$thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true );
+
+		if ( $thumb_url ) {
+			$thumb_url = $thumb_url[0];
+		}
 	}
 
 	$post            = get_post( $attachment_id );
@@ -1477,7 +1567,8 @@
 		'toggle'     => true,
 		'show_title' => true,
 	);
-	$args         = wp_parse_args( $args, $default_args );
+
+	$parsed_args = wp_parse_args( $args, $default_args );
 
 	/**
 	 * Filters the arguments used to retrieve an image for the edit image form.
@@ -1486,9 +1577,9 @@
 	 *
 	 * @see get_media_item
 	 *
-	 * @param array $args An array of arguments.
+	 * @param array $parsed_args An array of arguments.
 	 */
-	$r = apply_filters( 'get_media_item_args', $args );
+	$parsed_args = apply_filters( 'get_media_item_args', $parsed_args );
 
 	$toggle_on  = __( 'Show' );
 	$toggle_off = __( 'Hide' );
@@ -1502,26 +1593,26 @@
 	$type            = reset( $keys );
 	$type_html       = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
 
-	$form_fields = get_attachment_fields_to_edit( $post, $r['errors'] );
-
-	if ( $r['toggle'] ) {
-		$class        = empty( $r['errors'] ) ? 'startclosed' : 'startopen';
+	$form_fields = get_attachment_fields_to_edit( $post, $parsed_args['errors'] );
+
+	if ( $parsed_args['toggle'] ) {
+		$class        = empty( $parsed_args['errors'] ) ? 'startclosed' : 'startopen';
 		$toggle_links = "
-	<a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
-	<a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
+		<a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
+		<a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
 	} else {
 		$class        = '';
 		$toggle_links = '';
 	}
 
-	$display_title = ( ! empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
-	$display_title = $r['show_title'] ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . '</span></div>' : '';
-
-	$gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
+	$display_title = ( ! empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case.
+	$display_title = $parsed_args['show_title'] ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . '</span></div>' : '';
+
+	$gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' === $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' === $redir_tab ) );
 	$order   = '';
 
 	foreach ( $form_fields as $key => $val ) {
-		if ( 'menu_order' == $key ) {
+		if ( 'menu_order' === $key ) {
 			if ( $gallery ) {
 				$order = "<div class='menu_order'> <input class='menu_order_input' type='text' id='attachments[$attachment_id][menu_order]' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ) . "' /></div>";
 			} else {
@@ -1535,6 +1626,7 @@
 
 	$media_dims = '';
 	$meta       = wp_get_attachment_metadata( $post->ID );
+
 	if ( isset( $meta['width'], $meta['height'] ) ) {
 		$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
 	}
@@ -1550,6 +1642,7 @@
 	$media_dims = apply_filters( 'media_meta', $media_dims, $post );
 
 	$image_edit_button = '';
+
 	if ( wp_attachment_is_image( $post->ID ) && wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
 		$nonce             = wp_create_nonce( "image_editor-$post->ID" );
 		$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
@@ -1558,13 +1651,13 @@
 	$attachment_url = get_permalink( $attachment_id );
 
 	$item = "
-	$type_html
-	$toggle_links
-	$order
-	$display_title
-	<table class='slidetoggle describe $class'>
-		<thead class='media-item-info' id='media-head-$post->ID'>
-		<tr>
+		$type_html
+		$toggle_links
+		$order
+		$display_title
+		<table class='slidetoggle describe $class'>
+			<thead class='media-item-info' id='media-head-$post->ID'>
+			<tr>
 			<td class='A1B1' id='thumbnail-head-$post->ID'>
 			<p><a href='$attachment_url' target='_blank'><img class='thumbnail' src='$thumb_url' alt='' /></a></p>
 			<p>$image_edit_button</p>
@@ -1573,18 +1666,22 @@
 			<p><strong>" . __( 'File name:' ) . "</strong> $filename</p>
 			<p><strong>" . __( 'File type:' ) . "</strong> $post->post_mime_type</p>
 			<p><strong>" . __( 'Upload date:' ) . '</strong> ' . mysql2date( __( 'F j, Y' ), $post->post_date ) . '</p>';
+
 	if ( ! empty( $media_dims ) ) {
 		$item .= '<p><strong>' . __( 'Dimensions:' ) . "</strong> $media_dims</p>\n";
 	}
 
-			$item .= "</td></tr>\n";
+	$item .= "</td></tr>\n";
 
 	$item .= "
 		</thead>
 		<tbody>
 		<tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>\n
 		<tr><td style='display:none' colspan='2' class='image-editor' id='image-editor-$post->ID'></td></tr>\n
-		<tr><td colspan='2'><p class='media-types media-types-required-info'>" . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . "</p></td></tr>\n";
+		<tr><td colspan='2'><p class='media-types media-types-required-info'>" .
+			/* translators: %s: Asterisk symbol (*). */
+			sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) .
+		"</p></td></tr>\n";
 
 	$defaults = array(
 		'input'      => 'text',
@@ -1593,18 +1690,18 @@
 		'extra_rows' => array(),
 	);
 
-	if ( $r['send'] ) {
-		$r['send'] = get_submit_button( __( 'Insert into Post' ), '', "send[$attachment_id]", false );
+	if ( $parsed_args['send'] ) {
+		$parsed_args['send'] = get_submit_button( __( 'Insert into Post' ), '', "send[$attachment_id]", false );
 	}
 
-	$delete = empty( $r['delete'] ) ? '' : $r['delete'];
+	$delete = empty( $parsed_args['delete'] ) ? '' : $parsed_args['delete'];
 	if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
 		if ( ! EMPTY_TRASH_DAYS ) {
 			$delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete-permanently'>" . __( '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;'>" .
-				/* translators: %s: file name */
+				/* translators: %s: File name. */
 				'<p>' . sprintf( __( 'You are about to delete %s.' ), '<strong>' . $filename . '</strong>' ) . "</p>
 				<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
 				<a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . '</a>
@@ -1619,13 +1716,18 @@
 
 	$thumbnail       = '';
 	$calling_post_id = 0;
+
 	if ( isset( $_GET['post_id'] ) ) {
 		$calling_post_id = absint( $_GET['post_id'] );
-	} elseif ( isset( $_POST ) && count( $_POST ) ) {// Like for async-upload where $_GET['post_id'] isn't set
+	} 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 ) )
-		&& post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && 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
+	) {
 
 		$calling_post             = get_post( $calling_post_id );
 		$calling_post_type_object = get_post_type_object( $calling_post->post_type );
@@ -1634,13 +1736,14 @@
 		$thumbnail  = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html( $calling_post_type_object->labels->use_featured_image ) . '</a>';
 	}
 
-	if ( ( $r['send'] || $thumbnail || $delete ) && ! isset( $form_fields['buttons'] ) ) {
-		$form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>" . $r['send'] . " $thumbnail $delete</td></tr>\n" );
+	if ( ( $parsed_args['send'] || $thumbnail || $delete ) && ! isset( $form_fields['buttons'] ) ) {
+		$form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>" . $parsed_args['send'] . " $thumbnail $delete</td></tr>\n" );
 	}
+
 	$hidden_fields = array();
 
 	foreach ( $form_fields as $id => $field ) {
-		if ( $id[0] == '_' ) {
+		if ( '_' === $id[0] ) {
 			continue;
 		}
 
@@ -1652,7 +1755,7 @@
 		$field = array_merge( $defaults, $field );
 		$name  = "attachments[$attachment_id][$id]";
 
-		if ( $field['input'] == 'hidden' ) {
+		if ( 'hidden' === $field['input'] ) {
 			$hidden_fields[ $name ] = $field['value'];
 			continue;
 		}
@@ -1663,10 +1766,11 @@
 		$class        .= $field['required'] ? ' form-required' : '';
 
 		$item .= "\t\t<tr class='$class'>\n\t\t\t<th scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}{$required}</span><br class='clear' /></label></th>\n\t\t\t<td class='field'>";
+
 		if ( ! empty( $field[ $field['input'] ] ) ) {
 			$item .= $field[ $field['input'] ];
-		} elseif ( $field['input'] == 'textarea' ) {
-			if ( 'post_content' == $id && user_can_richedit() ) {
+		} elseif ( 'textarea' === $field['input'] ) {
+			if ( 'post_content' === $id && user_can_richedit() ) {
 				// Sanitize_post() skips the post_content when user_can_richedit.
 				$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
 			}
@@ -1675,6 +1779,7 @@
 		} else {
 			$item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "'{$required_attr} />";
 		}
+
 		if ( ! empty( $field['helps'] ) ) {
 			$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
 		}
@@ -1706,6 +1811,7 @@
 	if ( ! empty( $form_fields['_final'] ) ) {
 		$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
 	}
+
 	$item .= "\t</tbody>\n";
 	$item .= "\t</table>\n";
 
@@ -1749,17 +1855,21 @@
 	if ( $args['in_modal'] ) {
 		foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
 			$t = (array) get_taxonomy( $taxonomy );
+
 			if ( ! $t['public'] || ! $t['show_ui'] ) {
 				continue;
 			}
+
 			if ( empty( $t['label'] ) ) {
 				$t['label'] = $taxonomy;
 			}
+
 			if ( empty( $t['args'] ) ) {
 				$t['args'] = array();
 			}
 
 			$terms = get_object_term_cache( $post->ID, $taxonomy );
+
 			if ( false === $terms ) {
 				$terms = wp_get_object_terms( $post->ID, $taxonomy, $t['args'] );
 			}
@@ -1769,6 +1879,7 @@
 			foreach ( $terms as $term ) {
 				$values[] = $term->slug;
 			}
+
 			$t['value']    = join( ', ', $values );
 			$t['taxonomy'] = true;
 
@@ -1776,8 +1887,12 @@
 		}
 	}
 
-	// Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
-	// The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing )
+	/*
+	 * Merge default fields with their errors, so any key passed with the error
+	 * (e.g. 'error', 'helps', 'value') will replace the default.
+	 * The recursive merge is easily traversed with array casting:
+	 * foreach ( (array) $things as $thing )
+	 */
 	$form_fields = array_merge_recursive( $form_fields, (array) $args['errors'] );
 
 	/** This filter is documented in wp-admin/includes/media.php */
@@ -1810,8 +1925,9 @@
 	$hidden_fields = array();
 
 	$item = '';
+
 	foreach ( $form_fields as $id => $field ) {
-		if ( $id[0] == '_' ) {
+		if ( '_' === $id[0] ) {
 			continue;
 		}
 
@@ -1829,7 +1945,7 @@
 			continue;
 		}
 
-		if ( $field['input'] == 'hidden' ) {
+		if ( 'hidden' === $field['input'] ) {
 			$hidden_fields[ $name ] = $field['value'];
 			continue;
 		}
@@ -1846,8 +1962,8 @@
 
 		if ( ! empty( $field[ $field['input'] ] ) ) {
 			$item .= $field[ $field['input'] ];
-		} elseif ( $field['input'] == 'textarea' ) {
-			if ( 'post_content' == $id && user_can_richedit() ) {
+		} elseif ( 'textarea' === $field['input'] ) {
+			if ( 'post_content' === $id && user_can_richedit() ) {
 				// sanitize_post() skips the post_content when user_can_richedit.
 				$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
 			}
@@ -1855,9 +1971,11 @@
 		} else {
 			$item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly{$required_attr} />";
 		}
+
 		if ( ! empty( $field['helps'] ) ) {
 			$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
 		}
+
 		$item .= "</td>\n\t\t</tr>\n";
 
 		$extra_rows = array();
@@ -1889,8 +2007,10 @@
 
 	if ( $item ) {
 		$item = '<p class="media-types media-types-required-info">' .
-			sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</p>
-			<table class="compat-attachment-fields">' . $item . '</table>';
+			/* translators: %s: Asterisk symbol (*). */
+			sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) .
+			'</p>' .
+			'<table class="compat-attachment-fields">' . $item . '</table>';
 	}
 
 	foreach ( $hidden_fields as $hidden_field => $value ) {
@@ -1916,6 +2036,7 @@
 	$post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
 
 	echo '<script type="text/javascript">post_id = ' . $post_id . ';</script>';
+
 	if ( empty( $_GET['chromeless'] ) ) {
 		echo '<div id="media-upload-header">';
 		the_media_upload_tabs();
@@ -1939,7 +2060,11 @@
 	global $type, $tab, $is_IE, $is_opera;
 
 	if ( ! _device_can_upload() ) {
-		echo '<p>' . sprintf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ), 'https://apps.wordpress.org/' ) . '</p>';
+		echo '<p>' . sprintf(
+			/* translators: %s: https://apps.wordpress.org/ */
+			__( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ),
+			'https://apps.wordpress.org/'
+		) . '</p>';
 		return;
 	}
 
@@ -1952,9 +2077,9 @@
 	if ( ! $max_upload_size ) {
 		$max_upload_size = 0;
 	}
+
 	?>
-
-<div id="media-upload-notice">
+	<div id="media-upload-notice">
 	<?php
 
 	if ( isset( $errors['upload_notice'] ) ) {
@@ -1962,8 +2087,8 @@
 	}
 
 	?>
-</div>
-<div id="media-upload-error">
+	</div>
+	<div id="media-upload-error">
 	<?php
 
 	if ( isset( $errors['upload_error'] ) && is_wp_error( $errors['upload_error'] ) ) {
@@ -1971,8 +2096,9 @@
 	}
 
 	?>
-</div>
+	</div>
 	<?php
+
 	if ( is_multisite() && ! is_upload_space_available() ) {
 		/**
 		 * Fires when an upload will exceed the defined upload space quota for a network site.
@@ -1988,7 +2114,7 @@
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'pre-upload-ui' );
+	do_action( 'pre-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
 	$post_params = array(
 		'post_id'  => $post_id,
@@ -2018,17 +2144,20 @@
 		'drop_element'     => 'drag-drop-area',
 		'file_data_name'   => 'async-upload',
 		'url'              => $upload_action_url,
-		'filters'          => array(
-			'max_file_size' => $max_upload_size . 'b',
-		),
+		'filters'          => array( 'max_file_size' => $max_upload_size . 'b' ),
 		'multipart_params' => $post_params,
 	);
 
-	// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
-	// when enabled. See #29602.
-	if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
-	strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
-
+	/*
+	 * Currently only iOS Safari supports multiple files uploading,
+	 * but iOS 7.x has a bug that prevents uploading of videos when enabled.
+	 * See #29602.
+	 */
+	if (
+		wp_is_mobile() &&
+		strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
+		strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false
+	) {
 		$plupload_init['multi_selection'] = false;
 	}
 
@@ -2042,24 +2171,27 @@
 	$plupload_init = apply_filters( 'plupload_init', $plupload_init );
 
 	?>
-
-<script type="text/javascript">
+	<script type="text/javascript">
 	<?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 wp_json_encode( $plupload_init ); ?>;
-</script>
-
-<div id="plupload-upload-ui" class="hide-if-no-js">
+	var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
+	wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
+	</script>
+
+	<div id="plupload-upload-ui" class="hide-if-no-js">
 	<?php
 	/**
 	 * Fires before the upload interface loads.
@@ -2067,15 +2199,16 @@
 	 * @since 2.6.0 As 'pre-flash-upload-ui'
 	 * @since 3.3.0
 	 */
-	do_action( 'pre-plupload-upload-ui' );
+	do_action( 'pre-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
 	?>
-<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 id="drag-drop-area">
+		<div class="drag-drop-inside">
+		<p class="drag-drop-info"><?php _e( 'Drop files to upload' ); ?></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>
 	</div>
-</div>
 	<?php
 	/**
 	 * Fires after the upload interface loads.
@@ -2083,18 +2216,19 @@
 	 * @since 2.6.0 As 'post-flash-upload-ui'
 	 * @since 3.3.0
 	 */
-	do_action( 'post-plupload-upload-ui' );
+	do_action( 'post-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 	?>
-</div>
-
-<div id="html-upload-ui" class="hide-if-js">
+	</div>
+
+	<div id="html-upload-ui" class="hide-if-js">
 	<?php
 	/**
 	 * Fires before the upload button in the media upload interface.
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'pre-html-upload-ui' );
+	do_action( 'pre-html-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
 	?>
 	<p id="async-upload-wrap">
 		<label class="screen-reader-text" for="async-upload"><?php _e( 'Upload' ); ?></label>
@@ -2109,11 +2243,17 @@
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'post-html-upload-ui' );
+	do_action( 'post-html-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+
 	?>
-</div>
-
-<p class="max-upload-size"><?php printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); ?></p>
+	</div>
+
+<p class="max-upload-size">
+	<?php
+	/* translators: %s: Maximum allowed file size. */
+	printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) );
+	?>
+</p>
 	<?php
 
 	/**
@@ -2123,7 +2263,7 @@
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'post-upload-ui' );
+	do_action( 'post-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 }
 
 /**
@@ -2131,8 +2271,8 @@
  *
  * @since 2.5.0
  *
- * @param string $type
- * @param object $errors
+ * @param string  $type
+ * @param object  $errors
  * @param integer $id
  */
 function media_upload_type_form( $type = 'file', $errors = null, $id = null ) {
@@ -2157,27 +2297,27 @@
 	if ( get_user_setting( 'uploader' ) ) {
 		$form_class .= ' html-uploader';
 	}
+
 	?>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $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' ); ?>
-
-<h3 class="media-title"><?php _e( 'Add media files from your computer' ); ?></h3>
+	<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $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' ); ?>
+
+	<h3 class="media-title"><?php _e( 'Add media files from your computer' ); ?></h3>
 
 	<?php media_upload_form( $errors ); ?>
 
-<script type="text/javascript">
-jQuery(function($){
-	var preloaded = $(".media-item.preloaded");
-	if ( preloaded.length > 0 ) {
-		preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-	}
-	updateMediaForm();
-});
-</script>
-<div id="media-items">
+	<script type="text/javascript">
+	jQuery(function($){
+		var preloaded = $(".media-item.preloaded");
+		if ( preloaded.length > 0 ) {
+			preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+		}
+		updateMediaForm();
+	});
+	</script>
+	<div id="media-items">
 	<?php
 
 	if ( $id ) {
@@ -2189,13 +2329,14 @@
 			exit;
 		}
 	}
+
 	?>
-</div>
-
-<p class="savebutton ml-submit">
-	<?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
-</p>
-</form>
+	</div>
+
+	<p class="savebutton ml-submit">
+		<?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
+	</p>
+	</form>
 	<?php
 }
 
@@ -2204,8 +2345,8 @@
  *
  * @since 2.7.0
  *
- * @param string $type
- * @param object $errors
+ * @param string  $type
+ * @param object  $errors
  * @param integer $id
  */
 function media_upload_type_url_form( $type = null, $errors = null, $id = null ) {
@@ -2225,16 +2366,16 @@
 	if ( get_user_setting( 'uploader' ) ) {
 		$form_class .= ' html-uploader';
 	}
+
 	?>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $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' ); ?>
-
-<h3 class="media-title"><?php _e( 'Insert media from another website' ); ?></h3>
-
-<script type="text/javascript">
-var addExtImage = {
+	<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $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' ); ?>
+
+	<h3 class="media-title"><?php _e( 'Insert media from another website' ); ?></h3>
+
+	<script type="text/javascript">
+	var addExtImage = {
 
 	width : '',
 	height : '',
@@ -2243,26 +2384,28 @@
 	insert : function() {
 		var t = this, html, f = document.forms[0], cls, title = '', alt = '', caption = '';
 
-		if ( '' == f.src.value || '' == t.width )
+		if ( '' === f.src.value || '' === t.width )
 			return false;
 
 		if ( f.alt.value )
 			alt = f.alt.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
-	<?php
-	/** This filter is documented in wp-admin/includes/media.php */
-	if ( ! apply_filters( 'disable_captions', '' ) ) {
+		<?php
+		/** This filter is documented in wp-admin/includes/media.php */
+		if ( ! apply_filters( 'disable_captions', '' ) ) {
+			?>
+			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
+		}
+
 		?>
-	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+'"'+cls+' width="'+t.width+'" height="'+t.height+'" />';
@@ -2316,17 +2459,17 @@
 		t.preloadImg.onerror = t.resetImageData;
 		t.preloadImg.src = src;
 	}
-};
-
-jQuery(document).ready( function($) {
-	$('.media-types input').click( function() {
-		$('table.describe').toggleClass('not-image', $('#not-image').prop('checked') );
+	};
+
+	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">
+	</script>
+
+	<div id="media-items">
+	<div class="media-item media-blank">
 	<?php
 	/**
 	 * Filters the insert media from URL form HTML.
@@ -2336,10 +2479,11 @@
 	 * @param string $form_html The insert from URL form HTML.
 	 */
 	echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) );
+
 	?>
-</div>
-</div>
-</form>
+	</div>
+	</div>
+	</form>
 	<?php
 }
 
@@ -2369,138 +2513,138 @@
 	if ( get_user_setting( 'uploader' ) ) {
 		$form_class .= ' html-uploader';
 	}
-	?>
-
-<script type="text/javascript">
-jQuery(function($){
-	var preloaded = $(".media-item.preloaded");
-	if ( preloaded.length > 0 ) {
-		preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-		updateMediaForm();
-	}
-});
-</script>
-<div id="sort-buttons" class="hide-if-no-js">
-<span>
-	<?php _e( 'All Tabs:' ); ?>
-<a href="#" id="showall"><?php _e( 'Show' ); ?></a>
-<a href="#" id="hideall" style="display:none;"><?php _e( 'Hide' ); ?></a>
-</span>
-	<?php _e( 'Sort Order:' ); ?>
-<a href="#" id="asc"><?php _e( 'Ascending' ); ?></a> |
-<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_url( $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">
-<thead><tr>
-<th><?php _e( 'Media' ); ?></th>
-<th class="order-head"><?php _e( 'Order' ); ?></th>
-<th class="actions-head"><?php _e( 'Actions' ); ?></th>
-</tr></thead>
-</table>
-<div id="media-items">
-	<?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
-	<?php echo get_media_items( $post_id, $errors ); ?>
-</div>
-
-<p class="ml-submit">
-	<?php
-	submit_button(
-		__( 'Save all changes' ),
-		'savebutton',
-		'save',
-		false,
-		array(
-			'id'    => 'save-all',
-			'style' => 'display: none;',
-		)
-	);
+
 	?>
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
-<input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
-</p>
-
-<div id="gallery-settings" style="display:none;">
-<div class="title"><?php _e( 'Gallery Settings' ); ?></div>
-<table id="basic" class="describe"><tbody>
-	<tr>
-	<th scope="row" class="label">
-		<label>
-		<span class="alignleft"><?php _e( 'Link thumbnails to:' ); ?></span>
-		</label>
-	</th>
-	<td class="field">
-		<input type="radio" name="linkto" id="linkto-file" value="file" />
-		<label for="linkto-file" class="radio"><?php _e( 'Image File' ); ?></label>
-
-		<input type="radio" checked="checked" name="linkto" id="linkto-post" value="post" />
-		<label for="linkto-post" class="radio"><?php _e( 'Attachment Page' ); ?></label>
-	</td>
-	</tr>
-
-	<tr>
-	<th scope="row" class="label">
-		<label>
-		<span class="alignleft"><?php _e( 'Order images by:' ); ?></span>
-		</label>
-	</th>
-	<td class="field">
-		<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="post_date"><?php _e( 'Date/Time' ); ?></option>
-			<option value="rand"><?php _e( 'Random' ); ?></option>
-		</select>
-	</td>
-	</tr>
-
-	<tr>
-	<th scope="row" class="label">
-		<label>
-		<span class="alignleft"><?php _e( 'Order:' ); ?></span>
-		</label>
-	</th>
-	<td class="field">
-		<input type="radio" checked="checked" name="order" id="order-asc" value="asc" />
-		<label for="order-asc" class="radio"><?php _e( 'Ascending' ); ?></label>
-
-		<input type="radio" name="order" id="order-desc" value="desc" />
-		<label for="order-desc" class="radio"><?php _e( 'Descending' ); ?></label>
-	</td>
-	</tr>
-
-	<tr>
-	<th scope="row" class="label">
-		<label>
-		<span class="alignleft"><?php _e( 'Gallery columns:' ); ?></span>
-		</label>
-	</th>
-	<td class="field">
-		<select id="columns" name="columns">
-			<option value="1">1</option>
-			<option value="2">2</option>
-			<option value="3" selected="selected">3</option>
-			<option value="4">4</option>
-			<option value="5">5</option>
-			<option value="6">6</option>
-			<option value="7">7</option>
-			<option value="8">8</option>
-			<option value="9">9</option>
-		</select>
-	</td>
-	</tr>
-</tbody></table>
-
-<p class="ml-submit">
-<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e( 'Insert gallery' ); ?>" />
-<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e( 'Update gallery settings' ); ?>" />
-</p>
-</div>
-</form>
+	<script type="text/javascript">
+	jQuery(function($){
+		var preloaded = $(".media-item.preloaded");
+		if ( preloaded.length > 0 ) {
+			preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+			updateMediaForm();
+		}
+	});
+	</script>
+	<div id="sort-buttons" class="hide-if-no-js">
+	<span>
+		<?php _e( 'All Tabs:' ); ?>
+	<a href="#" id="showall"><?php _e( 'Show' ); ?></a>
+	<a href="#" id="hideall" style="display:none;"><?php _e( 'Hide' ); ?></a>
+	</span>
+		<?php _e( 'Sort Order:' ); ?>
+	<a href="#" id="asc"><?php _e( 'Ascending' ); ?></a> |
+	<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_url( $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">
+	<thead><tr>
+	<th><?php _e( 'Media' ); ?></th>
+	<th class="order-head"><?php _e( 'Order' ); ?></th>
+	<th class="actions-head"><?php _e( 'Actions' ); ?></th>
+	</tr></thead>
+	</table>
+	<div id="media-items">
+		<?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
+		<?php echo get_media_items( $post_id, $errors ); ?>
+	</div>
+
+	<p class="ml-submit">
+		<?php
+		submit_button(
+			__( 'Save all changes' ),
+			'savebutton',
+			'save',
+			false,
+			array(
+				'id'    => 'save-all',
+				'style' => 'display: none;',
+			)
+		);
+		?>
+	<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+	<input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
+	<input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
+	</p>
+
+	<div id="gallery-settings" style="display:none;">
+	<div class="title"><?php _e( 'Gallery Settings' ); ?></div>
+	<table id="basic" class="describe"><tbody>
+		<tr>
+		<th scope="row" class="label">
+			<label>
+			<span class="alignleft"><?php _e( 'Link thumbnails to:' ); ?></span>
+			</label>
+		</th>
+		<td class="field">
+			<input type="radio" name="linkto" id="linkto-file" value="file" />
+			<label for="linkto-file" class="radio"><?php _e( 'Image File' ); ?></label>
+
+			<input type="radio" checked="checked" name="linkto" id="linkto-post" value="post" />
+			<label for="linkto-post" class="radio"><?php _e( 'Attachment Page' ); ?></label>
+		</td>
+		</tr>
+
+		<tr>
+		<th scope="row" class="label">
+			<label>
+			<span class="alignleft"><?php _e( 'Order images by:' ); ?></span>
+			</label>
+		</th>
+		<td class="field">
+			<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="post_date"><?php _e( 'Date/Time' ); ?></option>
+				<option value="rand"><?php _e( 'Random' ); ?></option>
+			</select>
+		</td>
+		</tr>
+
+		<tr>
+		<th scope="row" class="label">
+			<label>
+			<span class="alignleft"><?php _e( 'Order:' ); ?></span>
+			</label>
+		</th>
+		<td class="field">
+			<input type="radio" checked="checked" name="order" id="order-asc" value="asc" />
+			<label for="order-asc" class="radio"><?php _e( 'Ascending' ); ?></label>
+
+			<input type="radio" name="order" id="order-desc" value="desc" />
+			<label for="order-desc" class="radio"><?php _e( 'Descending' ); ?></label>
+		</td>
+		</tr>
+
+		<tr>
+		<th scope="row" class="label">
+			<label>
+			<span class="alignleft"><?php _e( 'Gallery columns:' ); ?></span>
+			</label>
+		</th>
+		<td class="field">
+			<select id="columns" name="columns">
+				<option value="1">1</option>
+				<option value="2">2</option>
+				<option value="3" selected="selected">3</option>
+				<option value="4">4</option>
+				<option value="5">5</option>
+				<option value="6">6</option>
+				<option value="7">7</option>
+				<option value="8">8</option>
+				<option value="9">9</option>
+			</select>
+		</td>
+		</tr>
+	</tbody></table>
+
+	<p class="ml-submit">
+	<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e( 'Insert gallery' ); ?>" />
+	<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e( 'Update gallery settings' ); ?>" />
+	</p>
+	</div>
+	</form>
 	<?php
 }
 
@@ -2509,9 +2653,9 @@
  *
  * @since 2.5.0
  *
- * @global wpdb      $wpdb
- * @global WP_Query  $wp_query
- * @global WP_Locale $wp_locale
+ * @global wpdb      $wpdb            WordPress database abstraction object.
+ * @global WP_Query  $wp_query        WordPress Query object.
+ * @global WP_Locale $wp_locale       WordPress date and time locale object.
  * @global string    $type
  * @global string    $tab
  * @global array     $post_mime_types
@@ -2548,175 +2692,174 @@
 	list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query( $q );
 
 	?>
-
-<form id="filter" method="get">
-<input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
-<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="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
-	<?php submit_button( __( 'Search Media' ), '', '', false ); ?>
-</p>
-
-<ul class="subsubsub">
-	<?php
-	$type_links = array();
-	$_num_posts = (array) wp_count_attachments();
-	$matches    = wp_match_mime_types( array_keys( $post_mime_types ), array_keys( $_num_posts ) );
-	foreach ( $matches as $_type => $reals ) {
-		foreach ( $reals as $real ) {
-			if ( isset( $num_posts[ $_type ] ) ) {
-				$num_posts[ $_type ] += $_num_posts[ $real ];
-			} else {
-				$num_posts[ $_type ] = $_num_posts[ $real ];
+	<form id="filter" method="get">
+	<input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
+	<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="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
+		<?php submit_button( __( 'Search Media' ), '', '', false ); ?>
+	</p>
+
+	<ul class="subsubsub">
+		<?php
+		$type_links = array();
+		$_num_posts = (array) wp_count_attachments();
+		$matches    = wp_match_mime_types( array_keys( $post_mime_types ), array_keys( $_num_posts ) );
+		foreach ( $matches as $_type => $reals ) {
+			foreach ( $reals as $real ) {
+				if ( isset( $num_posts[ $_type ] ) ) {
+					$num_posts[ $_type ] += $_num_posts[ $real ];
+				} else {
+					$num_posts[ $_type ] = $_num_posts[ $real ];
+				}
 			}
 		}
-	}
-	// If available type specified by media button clicked, filter by that type
-	if ( empty( $_GET['post_mime_type'] ) && ! empty( $num_posts[ $type ] ) ) {
-		$_GET['post_mime_type']                        = $type;
-		list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
-	}
-	if ( empty( $_GET['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
-		$class = ' class="current"';
-	} else {
-		$class = '';
-	}
-	$type_links[] = '<li><a href="' . esc_url(
-		add_query_arg(
-			array(
-				'post_mime_type' => 'all',
-				'paged'          => false,
-				'm'              => false,
-			)
-		)
-	) . '"' . $class . '>' . __( 'All Types' ) . '</a>';
-	foreach ( $post_mime_types as $mime_type => $label ) {
-		$class = '';
-
-		if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
-			continue;
+		// If available type specified by media button clicked, filter by that type.
+		if ( empty( $_GET['post_mime_type'] ) && ! empty( $num_posts[ $type ] ) ) {
+			$_GET['post_mime_type']                        = $type;
+			list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
 		}
-
-		if ( isset( $_GET['post_mime_type'] ) && wp_match_mime_types( $mime_type, $_GET['post_mime_type'] ) ) {
+		if ( empty( $_GET['post_mime_type'] ) || 'all' === $_GET['post_mime_type'] ) {
 			$class = ' class="current"';
+		} else {
+			$class = '';
 		}
-
 		$type_links[] = '<li><a href="' . esc_url(
 			add_query_arg(
 				array(
-					'post_mime_type' => $mime_type,
+					'post_mime_type' => 'all',
 					'paged'          => false,
+					'm'              => false,
 				)
 			)
-		) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[ $mime_type ] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[ $mime_type ] ) . '</span>' ) . '</a>';
-	}
-	/**
-	 * Filters the media upload mime type list items.
-	 *
-	 * Returned values should begin with an `<li>` tag.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param string[] $type_links An array of list items containing mime type link HTML.
-	 */
-	echo implode( ' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
-	unset( $type_links );
-	?>
-</ul>
-
-<div class="tablenav">
-
-	<?php
-	$page_links = paginate_links(
-		array(
-			'base'      => add_query_arg( 'paged', '%#%' ),
-			'format'    => '',
-			'prev_text' => __( '&laquo;' ),
-			'next_text' => __( '&raquo;' ),
-			'total'     => ceil( $wp_query->found_posts / 10 ),
-			'current'   => $q['paged'],
-		)
-	);
-
-	if ( $page_links ) {
-		echo "<div class='tablenav-pages'>$page_links</div>";
-	}
-	?>
-
-<div class="alignleft actions">
-	<?php
-
-	$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
-
-	$arc_result = $wpdb->get_results( $arc_query );
-
-	$month_count    = count( $arc_result );
-	$selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
-
-	if ( $month_count && ! ( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
-		?>
-<select name='m'>
-<option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
-		<?php
-		foreach ( $arc_result as $arc_row ) {
-			if ( $arc_row->yyear == 0 ) {
+		) . '"' . $class . '>' . __( 'All Types' ) . '</a>';
+		foreach ( $post_mime_types as $mime_type => $label ) {
+			$class = '';
+
+			if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
 				continue;
 			}
-			$arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
-
-			if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
-				$default = ' selected="selected"';
-			} else {
-				$default = '';
+
+			if ( isset( $_GET['post_mime_type'] ) && wp_match_mime_types( $mime_type, $_GET['post_mime_type'] ) ) {
+				$class = ' class="current"';
 			}
 
-			echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
-			echo esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
-			echo "</option>\n";
+			$type_links[] = '<li><a href="' . esc_url(
+				add_query_arg(
+					array(
+						'post_mime_type' => $mime_type,
+						'paged'          => false,
+					)
+				)
+			) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[ $mime_type ] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[ $mime_type ] ) . '</span>' ) . '</a>';
+		}
+		/**
+		 * Filters the media upload mime type list items.
+		 *
+		 * Returned values should begin with an `<li>` tag.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param string[] $type_links An array of list items containing mime type link HTML.
+		 */
+		echo implode( ' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
+		unset( $type_links );
+		?>
+	</ul>
+
+	<div class="tablenav">
+
+		<?php
+		$page_links = paginate_links(
+			array(
+				'base'      => add_query_arg( 'paged', '%#%' ),
+				'format'    => '',
+				'prev_text' => __( '&laquo;' ),
+				'next_text' => __( '&raquo;' ),
+				'total'     => ceil( $wp_query->found_posts / 10 ),
+				'current'   => $q['paged'],
+			)
+		);
+
+		if ( $page_links ) {
+			echo "<div class='tablenav-pages'>$page_links</div>";
 		}
 		?>
-</select>
-	<?php } ?>
-
-	<?php submit_button( __( 'Filter &#187;' ), '', 'post-query-submit', false ); ?>
-
-</div>
-
-<br class="clear" />
-</div>
-</form>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">
-
+
+	<div class="alignleft actions">
+		<?php
+
+		$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
+
+		$arc_result = $wpdb->get_results( $arc_query );
+
+		$month_count    = count( $arc_result );
+		$selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
+
+		if ( $month_count && ! ( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
+			?>
+			<select name='m'>
+			<option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
+			<?php
+
+			foreach ( $arc_result as $arc_row ) {
+				if ( 0 == $arc_row->yyear ) {
+					continue;
+				}
+
+				$arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
+
+				if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
+					$default = ' selected="selected"';
+				} else {
+					$default = '';
+				}
+
+				echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
+				echo esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
+				echo "</option>\n";
+			}
+
+			?>
+			</select>
+		<?php } ?>
+
+		<?php submit_button( __( 'Filter &#187;' ), '', 'post-query-submit', false ); ?>
+
+	</div>
+
+	<br class="clear" />
+	</div>
+	</form>
+
+	<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">
 	<?php wp_nonce_field( 'media-form' ); ?>
-	<?php //media_upload_form( $errors ); ?>
-
-<script type="text/javascript">
-<!--
-jQuery(function($){
-	var preloaded = $(".media-item.preloaded");
-	if ( preloaded.length > 0 ) {
-		preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-		updateMediaForm();
-	}
-});
--->
-</script>
-
-<div id="media-items">
-	<?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
-	<?php echo get_media_items( null, $errors ); ?>
-</div>
-<p class="ml-submit">
-	<?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-</p>
-</form>
+	<?php // media_upload_form( $errors ); ?>
+
+	<script type="text/javascript">
+	jQuery(function($){
+		var preloaded = $(".media-item.preloaded");
+		if ( preloaded.length > 0 ) {
+			preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+			updateMediaForm();
+		}
+	});
+	</script>
+
+	<div id="media-items">
+		<?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
+		<?php echo get_media_items( null, $errors ); ?>
+	</div>
+	<p class="ml-submit">
+		<?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
+	<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+	</p>
+	</form>
 	<?php
 }
 
@@ -2737,27 +2880,31 @@
 				<label for="caption"><span class="alignleft">' . __( 'Image Caption' ) . '</span></label>
 			</th>
 			<td class="field"><textarea id="caption" name="caption"></textarea></td>
-		</tr>
-';
+		</tr>';
 	} else {
 		$caption = '';
 	}
 
 	$default_align = get_option( 'image_default_align' );
+
 	if ( empty( $default_align ) ) {
 		$default_align = 'none';
 	}
 
-	if ( 'image' == $default_view ) {
+	if ( 'image' === $default_view ) {
 		$view        = 'image-only';
 		$table_class = '';
 	} else {
-		$view = $table_class = 'not-image';
+		$view        = 'not-image';
+		$table_class = $view;
 	}
 
 	return '
 	<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>
-	<p class="media-types media-types-required-info">' . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</p>
+	<p class="media-types media-types-required-info">' .
+		/* translators: %s: Asterisk symbol (*). */
+		sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) .
+	'</p>
 	<table class="describe ' . $table_class . '"><tbody>
 		<tr>
 			<th scope="row" class="label" style="width:130px;">
@@ -2787,13 +2934,13 @@
 		<tr class="align image-only">
 			<th 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"' : '' ) . ' />
+				<input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( 'none' === $default_align ? ' checked="checked"' : '' ) . ' />
 				<label for="align-none" class="align image-align-none-label">' . __( 'None' ) . '</label>
-				<input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'left' ? ' checked="checked"' : '' ) . ' />
+				<input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( 'left' === $default_align ? ' checked="checked"' : '' ) . ' />
 				<label for="align-left" class="align image-align-left-label">' . __( 'Left' ) . '</label>
-				<input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'center' ? ' checked="checked"' : '' ) . ' />
+				<input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( 'center' === $default_align ? ' checked="checked"' : '' ) . ' />
 				<label for="align-center" class="align image-align-center-label">' . __( 'Center' ) . '</label>
-				<input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'right' ? ' checked="checked"' : '' ) . ' />
+				<input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( 'right' === $default_align ? ' checked="checked"' : '' ) . ' />
 				<label for="align-right" class="align image-align-right-label">' . __( 'Right' ) . '</label>
 			</td>
 		</tr>
@@ -2820,9 +2967,7 @@
 				' . get_submit_button( __( 'Insert into Post' ), '', 'insertonlybutton', false ) . '
 			</td>
 		</tr>
-	</tbody></table>
-';
-
+	</tbody></table>';
 }
 
 /**
@@ -2835,7 +2980,8 @@
 function media_upload_flash_bypass() {
 	$browser_uploader = admin_url( 'media-new.php?browser-uploader' );
 
-	if ( $post = get_post() ) {
+	$post = get_post();
+	if ( $post ) {
 		$browser_uploader .= '&amp;post_id=' . intval( $post->ID );
 	} elseif ( ! empty( $GLOBALS['post_ID'] ) ) {
 		$browser_uploader .= '&amp;post_id=' . intval( $GLOBALS['post_ID'] );
@@ -2843,7 +2989,14 @@
 
 	?>
 	<p class="upload-flash-bypass">
-	<?php printf( __( 'You are using the multi-file uploader. Problems? Try the <a href="%1$s" target="%2$s">browser uploader</a> instead.' ), $browser_uploader, '_blank' ); ?>
+	<?php
+		printf(
+			/* translators: 1: URL to browser uploader, 2: Additional link attributes. */
+			__( 'You are using the multi-file uploader. Problems? Try the <a href="%1$s" %2$s>browser uploader</a> instead.' ),
+			$browser_uploader,
+			'target="_blank"'
+		);
+	?>
 	</p>
 	<?php
 }
@@ -2875,20 +3028,23 @@
  */
 function media_upload_max_image_resize() {
 	$checked = get_user_setting( 'upload_resize' ) ? ' checked="true"' : '';
-	$a       = $end = '';
+	$a       = '';
+	$end     = '';
 
 	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; ?> />
+	<p class="hide-if-no-js"><label>
+	<input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
 	<?php
-	/* translators: 1: link start tag, 2: link end tag, 3: width, 4: height */
+	/* translators: 1: Link start tag, 2: Link end tag, 3: Width, 4: 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>
+	</label></p>
 	<?php
 }
 
@@ -2899,7 +3055,7 @@
  */
 function multisite_over_quota_message() {
 	echo '<p>' . sprintf(
-		/* translators: %s: allowed space allocation */
+		/* translators: %s: Allowed space allocation. */
 		__( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
 		size_format( get_space_allowed() * MB_IN_BYTES )
 	) . '</p>';
@@ -2914,12 +3070,15 @@
  */
 function edit_form_image_editor( $post ) {
 	$open = isset( $_GET['image-editor'] );
+
 	if ( $open ) {
 		require_once ABSPATH . 'wp-admin/includes/image-edit.php';
 	}
 
-	$thumb_url = false;
-	if ( $attachment_id = intval( $post->ID ) ) {
+	$thumb_url     = false;
+	$attachment_id = intval( $post->ID );
+
+	if ( $attachment_id ) {
 		$thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
 	}
 
@@ -2929,6 +3088,7 @@
 	?>
 	<div class="wp_attachment_holder wp-clearfix">
 	<?php
+
 	if ( wp_attachment_is_image( $post->ID ) ) :
 		$image_edit_button = '';
 		if ( wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
@@ -2936,14 +3096,16 @@
 			$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
 		}
 
-		$open_style = $not_open_style = '';
+		$open_style     = '';
+		$not_open_style = '';
+
 		if ( $open ) {
 			$open_style = ' style="display:none"';
 		} else {
 			$not_open_style = ' style="display:none"';
 		}
+
 		?>
-
 		<div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
 
 		<div<?php echo $open_style; ?> class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
@@ -2951,10 +3113,13 @@
 			<p><?php echo $image_edit_button; ?></p>
 		</div>
 		<div<?php echo $not_open_style; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
-			<?php
-			if ( $open ) {
-				wp_image_editor( $attachment_id );}
-			?>
+		<?php
+
+		if ( $open ) {
+			wp_image_editor( $attachment_id );
+		}
+
+		?>
 		</div>
 		<?php
 	elseif ( $attachment_id && wp_attachment_is( 'audio', $post ) ) :
@@ -2970,17 +3135,20 @@
 		$meta = wp_get_attachment_metadata( $attachment_id );
 		$w    = ! empty( $meta['width'] ) ? min( $meta['width'], 640 ) : 0;
 		$h    = ! empty( $meta['height'] ) ? $meta['height'] : 0;
+
 		if ( $h && $w < $meta['width'] ) {
 			$h = round( ( $meta['height'] * $w ) / $meta['width'] );
 		}
 
 		$attr = array( 'src' => $att_url );
+
 		if ( ! empty( $w ) && ! empty( $h ) ) {
 			$attr['width']  = $w;
 			$attr['height'] = $h;
 		}
 
 		$thumb_id = get_post_thumbnail_id( $attachment_id );
+
 		if ( ! empty( $thumb_id ) ) {
 			$attr['poster'] = wp_get_attachment_url( $thumb_id );
 		}
@@ -2988,7 +3156,6 @@
 		echo wp_video_shortcode( $attr );
 
 	elseif ( isset( $thumb_url[0] ) ) :
-
 		?>
 		<div class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
 			<p id="thumbnail-head-<?php echo $attachment_id; ?>">
@@ -3009,6 +3176,7 @@
 		do_action( 'wp_edit_form_attachment_display', $post );
 
 	endif;
+
 	?>
 	</div>
 	<div class="wp_attachment_details edit-form-section">
@@ -3018,19 +3186,21 @@
 			<input type="text" class="widefat" name="_wp_attachment_image_alt" id="attachment_alt" aria-describedby="alt-text-description" value="<?php echo esc_attr( $alt_text ); ?>" />
 		</p>
 		<p class="attachment-alt-text-description" id="alt-text-description">
-			<?php
-			printf(
-				/* translators: 1: link to tutorial, 2: additional link attributes, 3: accessibility text */
-				__( '<a href="%1$s" %2$s>Describe the purpose of the image%3$s</a>. Leave empty if the image is purely decorative.' ),
-				esc_url( 'https://www.w3.org/WAI/tutorials/images/decision-tree' ),
-				'target="_blank" rel="noopener noreferrer"',
-				sprintf(
-					'<span class="screen-reader-text"> %s</span>',
-					/* translators: accessibility text */
-					__( '(opens in a new tab)' )
-				)
-			);
-			?>
+		<?php
+
+		printf(
+			/* translators: 1: Link to tutorial, 2: Additional link attributes, 3: Accessibility text. */
+			__( '<a href="%1$s" %2$s>Describe the purpose of the image%3$s</a>. Leave empty if the image is purely decorative.' ),
+			esc_url( 'https://www.w3.org/WAI/tutorials/images/decision-tree' ),
+			'target="_blank" rel="noopener noreferrer"',
+			sprintf(
+				'<span class="screen-reader-text"> %s</span>',
+				/* translators: Accessibility text. */
+				__( '(opens in a new tab)' )
+			)
+		);
+
+		?>
 		</p>
 	<?php endif; ?>
 
@@ -3040,27 +3210,32 @@
 		</p>
 
 	<?php
-		$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-		$editor_args        = array(
-			'textarea_name' => 'content',
-			'textarea_rows' => 5,
-			'media_buttons' => false,
-			'tinymce'       => false,
-			'quicktags'     => $quicktags_settings,
-		);
+
+	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
+	$editor_args        = array(
+		'textarea_name' => 'content',
+		'textarea_rows' => 5,
+		'media_buttons' => false,
+		'tinymce'       => false,
+		'quicktags'     => $quicktags_settings,
+	);
+
 	?>
 
-	<label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong>
-		<?php
-		if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
-			echo ': ' . __( 'Displayed on attachment pages.' );
-		}
-		?>
+	<label for="attachment_content" class="attachment-content-description"><strong><?php _e( 'Description' ); ?></strong>
+	<?php
+
+	if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
+		echo ': ' . __( 'Displayed on attachment pages.' );
+	}
+
+	?>
 	</label>
-	<?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
+	<?php wp_editor( format_to_edit( $post->post_content ), 'attachment_content', $editor_args ); ?>
 
 	</div>
 	<?php
+
 	$extras = get_compat_media_markup( $post->ID );
 	echo $extras['item'];
 	echo '<input type="hidden" id="image-edit-context" value="edit-attachment" />' . "\n";
@@ -3072,48 +3247,59 @@
  * @since 3.5.0
  */
 function attachment_submitbox_metadata() {
-	$post = get_post();
-
-	$file     = get_attached_file( $post->ID );
+	$post          = get_post();
+	$attachment_id = $post->ID;
+
+	$file     = get_attached_file( $attachment_id );
 	$filename = esc_html( wp_basename( $file ) );
 
 	$media_dims = '';
-	$meta       = wp_get_attachment_metadata( $post->ID );
+	$meta       = wp_get_attachment_metadata( $attachment_id );
+
 	if ( isset( $meta['width'], $meta['height'] ) ) {
-		$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+		$media_dims .= "<span id='media-dims-$attachment_id'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
 	}
 	/** This filter is documented in wp-admin/includes/media.php */
 	$media_dims = apply_filters( 'media_meta', $media_dims, $post );
 
-	$att_url = wp_get_attachment_url( $post->ID );
+	$att_url = wp_get_attachment_url( $attachment_id );
+
 	?>
 	<div class="misc-pub-section misc-pub-attachment">
 		<label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
 		<input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" id="attachment_url" value="<?php echo esc_attr( $att_url ); ?>" />
+		<span class="copy-to-clipboard-container">
+			<button type="button" class="button copy-attachment-url edit-media" data-clipboard-target="#attachment_url"><?php _e( 'Copy URL' ); ?></button>
+			<span class="success hidden" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
+		</span>
 	</div>
 	<div class="misc-pub-section misc-pub-filename">
 		<?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
 	</div>
 	<div class="misc-pub-section misc-pub-filetype">
-		<?php _e( 'File type:' ); ?> <strong>
-					<?php
-					if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) {
-						echo esc_html( strtoupper( $matches[1] ) );
-						list( $mime_type ) = explode( '/', $post->post_mime_type );
-						if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) {
-							if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) {
-								echo ' (' . $meta['mime_type'] . ')';
-							}
-						}
-					} else {
-						echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
-					}
-					?>
+		<?php _e( 'File type:' ); ?>
+		<strong>
+		<?php
+
+		if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) {
+			echo esc_html( strtoupper( $matches[1] ) );
+			list( $mime_type ) = explode( '/', $post->post_mime_type );
+			if ( 'image' !== $mime_type && ! empty( $meta['mime_type'] ) ) {
+				if ( "$mime_type/" . strtolower( $matches[1] ) !== $meta['mime_type'] ) {
+					echo ' (' . $meta['mime_type'] . ')';
+				}
+			}
+		} else {
+			echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
+		}
+
+		?>
 		</strong>
 	</div>
 
 	<?php
-		$file_size = false;
+
+	$file_size = false;
 
 	if ( isset( $meta['filesize'] ) ) {
 		$file_size = $meta['filesize'];
@@ -3121,13 +3307,13 @@
 		$file_size = filesize( $file );
 	}
 
-	if ( ! empty( $file_size ) ) :
+	if ( ! empty( $file_size ) ) {
 		?>
-			<div class="misc-pub-section misc-pub-filesize">
-				<?php _e( 'File size:' ); ?> <strong><?php echo size_format( $file_size ); ?></strong>
-			</div>
-			<?php
-		endif;
+		<div class="misc-pub-section misc-pub-filesize">
+			<?php _e( 'File size:' ); ?> <strong><?php echo size_format( $file_size ); ?></strong>
+		</div>
+		<?php
+	}
 
 	if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
 		$fields = array(
@@ -3153,24 +3339,28 @@
 			if ( empty( $meta[ $key ] ) ) {
 				continue;
 			}
+
 			?>
-		<div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
-			<?php echo $label; ?> <strong>
-						<?php
-						switch ( $key ) {
-							case 'bitrate':
-								echo round( $meta['bitrate'] / 1000 ) . 'kb/s';
-								if ( ! empty( $meta['bitrate_mode'] ) ) {
-									echo ' ' . strtoupper( esc_html( $meta['bitrate_mode'] ) );
-								}
-								break;
-							default:
-								echo esc_html( $meta[ $key ] );
-								break;
+			<div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
+				<?php echo $label; ?>
+				<strong>
+				<?php
+
+				switch ( $key ) {
+					case 'bitrate':
+						echo round( $meta['bitrate'] / 1000 ) . 'kb/s';
+						if ( ! empty( $meta['bitrate_mode'] ) ) {
+							echo ' ' . strtoupper( esc_html( $meta['bitrate_mode'] ) );
 						}
-						?>
-			</strong>
-		</div>
+						break;
+					default:
+						echo esc_html( $meta[ $key ] );
+						break;
+				}
+
+				?>
+				</strong>
+			</div>
 			<?php
 		}
 
@@ -3197,21 +3387,33 @@
 			if ( empty( $meta['audio'][ $key ] ) ) {
 				continue;
 			}
+
 			?>
-		<div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
-			<?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][ $key ] ); ?></strong>
-		</div>
+			<div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
+				<?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][ $key ] ); ?></strong>
+			</div>
 			<?php
 		}
 	}
 
-	if ( $media_dims ) :
+	if ( $media_dims ) {
 		?>
-	<div class="misc-pub-section misc-pub-dimensions">
-		<?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
-	</div>
+		<div class="misc-pub-section misc-pub-dimensions">
+			<?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
+		</div>
 		<?php
-	endif;
+	}
+
+	if ( ! empty( $meta['original_image'] ) ) {
+		?>
+		<div class="misc-pub-section misc-pub-original-image">
+			<?php _e( 'Original image:' ); ?>
+			<a href="<?php echo esc_url( wp_get_original_image_url( $attachment_id ) ); ?>">
+				<?php echo esc_html( wp_basename( wp_get_original_image_path( $attachment_id ) ) ); ?>
+			</a>
+		</div>
+		<?php
+	}
 }
 
 /**
@@ -3279,47 +3481,60 @@
 	}
 
 	if ( ! class_exists( 'getID3', false ) ) {
-		require( ABSPATH . WPINC . '/ID3/getid3.php' );
+		require ABSPATH . WPINC . '/ID3/getid3.php';
 	}
+
 	$id3  = new getID3();
 	$data = $id3->analyze( $file );
 
 	if ( isset( $data['video']['lossless'] ) ) {
 		$metadata['lossless'] = $data['video']['lossless'];
 	}
+
 	if ( ! empty( $data['video']['bitrate'] ) ) {
 		$metadata['bitrate'] = (int) $data['video']['bitrate'];
 	}
+
 	if ( ! empty( $data['video']['bitrate_mode'] ) ) {
 		$metadata['bitrate_mode'] = $data['video']['bitrate_mode'];
 	}
+
 	if ( ! empty( $data['filesize'] ) ) {
 		$metadata['filesize'] = (int) $data['filesize'];
 	}
+
 	if ( ! empty( $data['mime_type'] ) ) {
 		$metadata['mime_type'] = $data['mime_type'];
 	}
+
 	if ( ! empty( $data['playtime_seconds'] ) ) {
 		$metadata['length'] = (int) round( $data['playtime_seconds'] );
 	}
+
 	if ( ! empty( $data['playtime_string'] ) ) {
 		$metadata['length_formatted'] = $data['playtime_string'];
 	}
+
 	if ( ! empty( $data['video']['resolution_x'] ) ) {
 		$metadata['width'] = (int) $data['video']['resolution_x'];
 	}
+
 	if ( ! empty( $data['video']['resolution_y'] ) ) {
 		$metadata['height'] = (int) $data['video']['resolution_y'];
 	}
+
 	if ( ! empty( $data['fileformat'] ) ) {
 		$metadata['fileformat'] = $data['fileformat'];
 	}
+
 	if ( ! empty( $data['video']['dataformat'] ) ) {
 		$metadata['dataformat'] = $data['video']['dataformat'];
 	}
+
 	if ( ! empty( $data['video']['encoder'] ) ) {
 		$metadata['encoder'] = $data['video']['encoder'];
 	}
+
 	if ( ! empty( $data['video']['codec'] ) ) {
 		$metadata['codec'] = $data['video']['codec'];
 	}
@@ -3332,7 +3547,7 @@
 	if ( empty( $metadata['created_timestamp'] ) ) {
 		$created_timestamp = wp_get_media_creation_timestamp( $data );
 
-		if ( $created_timestamp !== false ) {
+		if ( false !== $created_timestamp ) {
 			$metadata['created_timestamp'] = $created_timestamp;
 		}
 	}
@@ -3369,6 +3584,7 @@
 	if ( ! file_exists( $file ) ) {
 		return false;
 	}
+
 	$metadata = array();
 
 	if ( ! defined( 'GETID3_TEMP_DIR' ) ) {
@@ -3376,8 +3592,9 @@
 	}
 
 	if ( ! class_exists( 'getID3', false ) ) {
-		require( ABSPATH . WPINC . '/ID3/getid3.php' );
+		require ABSPATH . WPINC . '/ID3/getid3.php';
 	}
+
 	$id3  = new getID3();
 	$data = $id3->analyze( $file );
 
@@ -3389,15 +3606,19 @@
 	if ( ! empty( $data['fileformat'] ) ) {
 		$metadata['fileformat'] = $data['fileformat'];
 	}
+
 	if ( ! empty( $data['filesize'] ) ) {
 		$metadata['filesize'] = (int) $data['filesize'];
 	}
+
 	if ( ! empty( $data['mime_type'] ) ) {
 		$metadata['mime_type'] = $data['mime_type'];
 	}
+
 	if ( ! empty( $data['playtime_seconds'] ) ) {
 		$metadata['length'] = (int) round( $data['playtime_seconds'] );
 	}
+
 	if ( ! empty( $data['playtime_string'] ) ) {
 		$metadata['length_formatted'] = $data['playtime_string'];
 	}
@@ -3464,7 +3685,7 @@
 }
 
 /**
- * Encapsulate logic for Attach/Detach actions
+ * Encapsulates the logic for Attach/Detach actions.
  *
  * @since 4.2.0
  *
@@ -3484,33 +3705,49 @@
 	if ( ! current_user_can( 'edit_post', $parent_id ) ) {
 		wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
 	}
+
 	$ids = array();
-	foreach ( (array) $_REQUEST['media'] as $att_id ) {
-		$att_id = (int) $att_id;
-
-		if ( ! current_user_can( 'edit_post', $att_id ) ) {
+
+	foreach ( (array) $_REQUEST['media'] as $attachment_id ) {
+		$attachment_id = (int) $attachment_id;
+
+		if ( ! current_user_can( 'edit_post', $attachment_id ) ) {
 			continue;
 		}
 
-		$ids[] = $att_id;
+		$ids[] = $attachment_id;
 	}
 
 	if ( ! empty( $ids ) ) {
 		$ids_string = implode( ',', $ids );
+
 		if ( 'attach' === $action ) {
 			$result = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $ids_string )", $parent_id ) );
 		} else {
 			$result = $wpdb->query( "UPDATE $wpdb->posts SET post_parent = 0 WHERE post_type = 'attachment' AND ID IN ( $ids_string )" );
 		}
-
-		foreach ( $ids as $att_id ) {
-			clean_attachment_cache( $att_id );
-		}
 	}
 
 	if ( isset( $result ) ) {
+		foreach ( $ids as $attachment_id ) {
+			/**
+			 * Fires when media is attached or detached from a post.
+			 *
+			 * @since 5.5.0
+			 *
+			 * @param string $action        Attach/detach action. Accepts 'attach' or 'detach'.
+			 * @param int    $attachment_id The attachment ID.
+			 * @param int    $parent_id     Attachment parent ID.
+			 */
+			do_action( 'wp_media_attach_action', $action, $attachment_id, $parent_id );
+
+			clean_attachment_cache( $attachment_id );
+		}
+
 		$location = 'upload.php';
-		if ( $referer = wp_get_referer() ) {
+		$referer  = wp_get_referer();
+
+		if ( $referer ) {
 			if ( false !== strpos( $referer, 'upload.php' ) ) {
 				$location = remove_query_arg( array( 'attached', 'detach' ), $referer );
 			}
@@ -3518,6 +3755,7 @@
 
 		$key      = 'attach' === $action ? 'attached' : 'detach';
 		$location = add_query_arg( array( $key => $result ), $location );
+
 		wp_redirect( $location );
 		exit;
 	}