[pull] master from WordPress:master

readme.html

@@ -76,7 +76,7 @@ <h2>Online Resources</h2>
 	<dt><a href="https://wordpress.org/support/forums/">WordPress Support Forums</a></dt>
 		<dd>If you&#8217;ve looked everywhere and still can&#8217;t find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd>
 	<dt><a href="https://make.wordpress.org/support/handbook/appendix/other-support-locations/introduction-to-irc/">WordPress <abbr>IRC</abbr> (Internet Relay Chat) Channel</a></dt>
-		<dd>There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
+		<dd>There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="https://web.libera.chat/#wordpress">irc.libera.chat #wordpress</a>)</dd>
 </dl>
 
 <h2>Final Notes</h2>

wp-admin/admin.php

@@ -320,13 +320,24 @@
 	 *
 	 * The dynamic portion of the hook name, `$importer`, refers to the importer slug.
 	 *
+	 * Possible hook names include:
+	 *
+	 *  - `load-importer-blogger`
+	 *  - `load-importer-wpcat2tag`
+	 *  - `load-importer-livejournal`
+	 *  - `load-importer-mt`
+	 *  - `load-importer-rss`
+	 *  - `load-importer-tumblr`
+	 *  - `load-importer-wordpress`
+	 *
 	 * @since 3.5.0
 	 */
 	do_action( "load-importer-{$importer}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
+	// Used in the HTML title tag.
+	$title        = __( 'Import' );
 	$parent_file  = 'tools.php';
 	$submenu_file = 'import.php';
-	$title        = __( 'Import' );
 
 	if ( ! isset( $_GET['noheader'] ) ) {
 		require_once ABSPATH . 'wp-admin/admin-header.php';

wp-admin/async-upload.php

@@ -49,35 +49,37 @@
 	switch ( $_REQUEST['fetch'] ) {
 		case 3:
 			?>
-			<div class="attachment-details">
-				<?php
-				$thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true );
-				if ( $thumb_url ) {
-					echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
-				}
-
-				// Title shouldn't ever be empty, but use filename just in case.
-				$file     = get_attached_file( $post->ID );
-				$file_url = wp_get_attachment_url( $post->ID );
-				$title    = $post->post_title ? $post->post_title : wp_basename( $file );
-				?>
-				<div class="filename new">
-					<span class="media-list-title"><strong><?php echo esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ); ?></strong></span>
-					<span class="media-list-subtitle"><?php echo wp_basename( $file ); ?></span>
+			<div class="media-item-wrapper">
+				<div class="attachment-details">
+					<?php
+					$thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true );
+					if ( $thumb_url ) {
+						echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+					}
+
+					// Title shouldn't ever be empty, but use filename just in case.
+					$file     = get_attached_file( $post->ID );
+					$file_url = wp_get_attachment_url( $post->ID );
+					$title    = $post->post_title ? $post->post_title : wp_basename( $file );
+					?>
+					<div class="filename new">
+						<span class="media-list-title"><strong><?php echo esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ); ?></strong></span>
+						<span class="media-list-subtitle"><?php echo wp_basename( $file ); ?></span>
+					</div>
+				</div>
+				<div class="attachment-tools">
+					<span class="media-item-copy-container copy-to-clipboard-container edit-attachment">
+						<button type="button" class="button button-small copy-attachment-url" data-clipboard-text="<?php echo $file_url; ?>"><?php _e( 'Copy URL to clipboard' ); ?></button>
+						<span class="success hidden" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
+					</span>
+					<?php
+					if ( current_user_can( 'edit_post', $id ) ) {
+						echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
+					} else {
+						echo '<span class="edit-attachment">' . _x( 'Success', 'media item' ) . '</span>';
+					}
+					?>
 				</div>
-			</div>
-			<div class="attachment-tools">
-				<span class="media-item-copy-container copy-to-clipboard-container edit-attachment">
-					<button type="button" class="button button-small copy-attachment-url" data-clipboard-text="<?php echo $file_url; ?>"><?php _e( 'Copy URL to clipboard' ); ?></button>
-					<span class="success hidden" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
-				</span>
-				<?php
-				if ( current_user_can( 'edit_post', $id ) ) {
-					echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
-				} else {
-					echo '<span class="edit-attachment">' . _x( 'Success', 'media item' ) . '</span>';
-				}
-				?>
 			</div>
 			<?php
 			break;

wp-admin/authorize-application.php

@@ -62,6 +62,7 @@
 	}
 }
 
+// Used in the HTML title tag.
 $title = __( 'Authorize Application' );
 
 $app_name    = ! empty( $_REQUEST['app_name'] ) ? $_REQUEST['app_name'] : '';
@@ -90,7 +91,7 @@
 
 if ( wp_is_site_protected_by_basic_auth( 'front' ) ) {
 	wp_die(
-		__( 'Your website appears to use Basic Authentication, which is not currently compatible with Application Passwords.' ),
+		__( 'Your website appears to use Basic Authentication, which is not currently compatible with application passwords.' ),
 		__( 'Cannot Authorize Application' ),
 		array(
 			'response'  => 501,
@@ -147,13 +148,13 @@
 				<?php
 				printf(
 					/* translators: %s: Application name. */
-					__( 'Would you like to give the application identifying itself as %s access to your account? You should only do this if you trust the app in question.' ),
+					__( 'Would you like to give the application identifying itself as %s access to your account? You should only do this if you trust the application in question.' ),
 					'<strong>' . esc_html( $app_name ) . '</strong>'
 				);
 				?>
 			</p>
 		<?php else : ?>
-			<p><?php _e( 'Would you like to give this application access to your account? You should only do this if you trust the app in question.' ); ?></p>
+			<p><?php _e( 'Would you like to give this application access to your account? You should only do this if you trust the application in question.' ); ?></p>
 		<?php endif; ?>
 
 		<?php
@@ -247,7 +248,7 @@
 
 				<?php
 				submit_button(
-					__( 'Yes, I approve of this connection.' ),
+					__( 'Yes, I approve of this connection' ),
 					'primary',
 					'approve',
 					false,
@@ -262,7 +263,7 @@
 						printf(
 							/* translators: %s: The URL the user is being redirected to. */
 							__( 'You will be sent to %s' ),
-							'<strong><kbd>' . esc_html(
+							'<strong><code>' . esc_html(
 								add_query_arg(
 									array(
 										'site_url'   => site_url(),
@@ -271,7 +272,7 @@
 									),
 									$success_url
 								)
-							) . '</kbd></strong>'
+							) . '</code></strong>'
 						);
 					} else {
 						_e( 'You will be given a password to manually enter into the application in question.' );
@@ -281,7 +282,7 @@
 
 				<?php
 				submit_button(
-					__( 'No, I do not approve of this connection.' ),
+					__( 'No, I do not approve of this connection' ),
 					'secondary',
 					'reject',
 					false,
@@ -296,7 +297,7 @@
 						printf(
 							/* translators: %s: The URL the user is being redirected to. */
 							__( 'You will be sent to %s' ),
-							'<strong><kbd>' . esc_html( $reject_url ) . '</kbd></strong>'
+							'<strong><code>' . esc_html( $reject_url ) . '</code></strong>'
 						);
 					} else {
 						_e( 'You will be returned to the WordPress Dashboard, and no changes will be made.' );

wp-admin/comment.php

@@ -53,6 +53,7 @@
 switch ( $action ) {
 
 	case 'editcomment':
+		// Used in the HTML title tag.
 		$title = __( 'Edit Comment' );
 
 		get_current_screen()->add_help_tab(
@@ -96,6 +97,7 @@
 	case 'approve':
 	case 'trash':
 	case 'spam':
+		// Used in the HTML title tag.
 		$title = __( 'Moderate Comment' );
 
 		if ( ! $comment ) {
@@ -167,19 +169,19 @@
 
 <table class="form-table comment-ays">
 <tr>
-<th scope="row"><?php _e( 'Author' ); ?></th>
-<td><?php comment_author( $comment ); ?></td>
+	<th scope="row"><?php _e( 'Author' ); ?></th>
+	<td><?php comment_author( $comment ); ?></td>
 </tr>
 		<?php if ( get_comment_author_email( $comment ) ) { ?>
 <tr>
-<th scope="row"><?php _e( 'Email' ); ?></th>
-<td><?php comment_author_email( $comment ); ?></td>
+	<th scope="row"><?php _e( 'Email' ); ?></th>
+	<td><?php comment_author_email( $comment ); ?></td>
 </tr>
 <?php } ?>
 		<?php if ( get_comment_author_url( $comment ) ) { ?>
 <tr>
-<th scope="row"><?php _e( 'URL' ); ?></th>
-<td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
+	<th scope="row"><?php _e( 'URL' ); ?></th>
+	<td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
 </tr>
 <?php } ?>
 <tr>
@@ -207,8 +209,8 @@
 		}
 		?>
 	</td>
-	</tr>
-	<tr>
+</tr>
+<tr>
 	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
 	<td>
 		<?php
@@ -226,31 +228,32 @@
 			echo $submitted;
 		}
 		?>
-		</td>
-	</tr>
-	<tr>
+	</td>
+</tr>
+<tr>
 	<th scope="row"><?php /* translators: Field name in comment form. */ _ex( 'Comment', 'noun' ); ?></th>
 	<td class="comment-content">
 		<?php comment_text( $comment ); ?>
-	<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
+		<p class="edit-comment">
+			<a href="<?php echo esc_url( admin_url( "comment.php?action=editcomment&c={$comment->comment_ID}" ) ); ?>"><?php esc_html_e( 'Edit' ); ?></a>
+		</p>
 	</td>
-	</tr>
-	</table>
-
-	<form action="comment.php" method="get" class="comment-ays-submit">
+</tr>
+</table>
 
+<form action="comment.php" method="get" class="comment-ays-submit">
 	<p>
 		<?php submit_button( $button, 'primary', 'submit', false ); ?>
-	<a href="<?php echo admin_url( 'edit-comments.php' ); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
+		<a href="<?php echo esc_url( admin_url( 'edit-comments.php' ) ); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
 	</p>
 
 		<?php wp_nonce_field( $nonce_action ); ?>
 	<input type="hidden" name="action" value="<?php echo esc_attr( $formaction ); ?>" />
 	<input type="hidden" name="c" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
 	<input type="hidden" name="noredir" value="1" />
-	</form>
+</form>
 
-	</div>
+</div>
 		<?php
 		break;
 

wp-admin/credits.php

@@ -10,6 +10,7 @@
 require_once __DIR__ . '/admin.php';
 require_once __DIR__ . '/includes/credits.php';
 
+// Used in the HTML title tag.
 $title = __( 'Credits' );
 
 list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
@@ -21,21 +22,14 @@
 <div class="wrap about__container">
 
 	<div class="about__header">
-		<div class="about__header-image">
-			<img alt="<?php _e( 'Code is Poetry' ); ?>" src="<?php echo admin_url( 'images/about-badge.svg' ); ?>" />
+		<div class="about__header-title">
+			<h1>
+				<?php _e( 'Contributors' ); ?>
+			</h1>
 		</div>
 
-		<div class="about__header-container">
-			<div class="about__header-title">
-				<p>
-					<?php _e( 'WordPress' ); ?>
-					<?php echo $display_version; ?>
-				</p>
-			</div>
-
-			<div class="about__header-text">
-				<?php _e( 'Jazz up your stories in an editor that’s cleaner, crisper, and does more to get out of your way.' ); ?>
-			</div>
+		<div class="about__header-text">
+			<?php _e( 'WordPress 5.8 was created by a worldwide team of passionate individuals' ); ?>
 		</div>
 
 		<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
@@ -46,36 +40,28 @@
 		</nav>
 	</div>
 
-	<div class="about__section is-feature">
-		<div class="column">
-			<h1><?php _e( 'Credits' ); ?></h1>
-
+	<div class="about__section has-1-column">
+		<div class="column aligncenter">
 			<?php if ( ! $credits ) : ?>
 
 			<p>
 				<?php
 				printf(
-					/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
-					__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
-					__( 'https://wordpress.org/about/' ),
-					__( 'https://make.wordpress.org/' )
+					/* translators: 1: https://wordpress.org/about/ */
+					__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals.' ),
+					__( 'https://wordpress.org/about/' )
 				);
 				?>
+				<br />
+				<a href="https://make.wordpress.org/"><?php _e( 'Get involved in WordPress.' ); ?></a>
 			</p>
 
 			<?php else : ?>
 
 			<p>
-				<?php _e( 'WordPress is created by a worldwide team of passionate individuals.' ); ?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: https://make.wordpress.org/ */
-					__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
-					__( 'https://make.wordpress.org/' )
-				);
-				?>
+				<?php _e( 'Want to see your name in lights on this page?' ); ?>
+				<br />
+				<a href="https://make.wordpress.org/"><?php _e( 'Get involved in WordPress.' ); ?></a>
 			</p>
 
 			<?php endif; ?>
@@ -93,7 +79,7 @@
 	<hr />
 
 	<div class="about__section">
-		<div class="column has-subtle-background-color">
+		<div class="column is-edge-to-edge">
 			<?php wp_credits_section_title( $credits['groups']['core-developers'] ); ?>
 			<?php wp_credits_section_list( $credits, 'core-developers' ); ?>
 			<?php wp_credits_section_list( $credits, 'contributing-developers' ); ?>