Merge remote-tracking branch 'upstream/trunk' into 6-9/dependency-updates

Author: desrosj

Gruntfile.js

@@ -1159,7 +1159,7 @@ module.exports = function(grunt) {
 								}
 
 								// Fetch a list of the files that Twemoji supplies.
-								query = 'query={repository(owner: "jdecked", name: "twemoji") {object(expression: "v17.0.1:assets/svg") {... on Tree {entries {name}}}}}';
+								query = 'query={repository(owner: "jdecked", name: "twemoji") {object(expression: "gh-pages:v/17.0.2/svg") {... on Tree {entries {name}}}}}';
 								files = spawn( 'gh', [ 'api', 'graphql', '-f', query] );
 
 								if ( 0 !== files.status ) {

src/js/_enqueues/vendor/twemoji.js

@@ -534,7 +534,7 @@ var twemoji = (function (
       how = {callback: how};
     }
 
-	// WP start
+    // WP start
     // Allow passing of the doNotParse() callback in the settings.
     // The callback is used in `grabAllTextNodes()` (DOM mode only) as a filter
     // that allows bypassing of some of the text nodes. It gets the current subnode as argument.

src/wp-admin/includes/class-theme-installer-skin.php

@@ -121,14 +121,24 @@ public function after() {
 
 		$install_actions = array();
 
-		if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) && ! $theme_info->is_block_theme() ) {
-			$customize_url = add_query_arg(
-				array(
-					'theme'  => urlencode( $stylesheet ),
-					'return' => urlencode( admin_url( 'web' === $this->type ? 'theme-install.php' : 'themes.php' ) ),
-				),
-				admin_url( 'customize.php' )
-			);
+		if ( current_user_can( 'edit_theme_options' ) && ( $theme_info->is_block_theme() || current_user_can( 'customize' ) ) ) {
+			if ( $theme_info->is_block_theme() ) {
+				$customize_url = add_query_arg(
+					array(
+						'wp_theme_preview' => urlencode( $stylesheet ),
+						'return'           => urlencode( admin_url( 'web' === $this->type ? 'theme-install.php' : 'themes.php' ) ),
+					),
+					admin_url( 'site-editor.php' )
+				);
+			} else {
+				$customize_url = add_query_arg(
+					array(
+						'theme'  => urlencode( $stylesheet ),
+						'return' => urlencode( admin_url( 'web' === $this->type ? 'theme-install.php' : 'themes.php' ) ),
+					),
+					admin_url( 'customize.php' )
+				);
+			}
 
 			$install_actions['preview'] = sprintf(
 				'<a href="%s" class="hide-if-no-customize load-customize">' .

src/wp-admin/includes/dashboard.php

@@ -1074,6 +1074,7 @@ function wp_dashboard_recent_comments( $total_items = 5 ) {
 		$comments_query['status'] = 'approve';
 	}
 
+	$comments_count = 0;
 	do {
 		$possible = get_comments( $comments_query );
 

src/wp-admin/includes/schema.php

@@ -563,7 +563,6 @@ function populate_options( array $options = array() ) {
 
 		// 6.9.0
 		'wp_notes_notify'                 => 1,
-
 	);
 
 	// 3.3.0

src/wp-admin/menu.php

@@ -40,14 +40,15 @@
 
 if ( ! is_multisite() ) {
 	if ( current_user_can( 'update_core' ) ) {
-		$cap = 'update_core';
+		$capability = 'update_core';
 	} elseif ( current_user_can( 'update_plugins' ) ) {
-		$cap = 'update_plugins';
+		$capability = 'update_plugins';
 	} elseif ( current_user_can( 'update_themes' ) ) {
-		$cap = 'update_themes';
+		$capability = 'update_themes';
 	} else {
-		$cap = 'update_languages';
+		$capability = 'update_languages';
 	}
+
 	$submenu['index.php'][10] = array(
 		sprintf(
 			/* translators: %s: Number of pending updates. */
@@ -58,30 +59,35 @@
 				number_format_i18n( $update_data['counts']['total'] )
 			)
 		),
-		$cap,
+		$capability,
 		'update-core.php',
 	);
-	unset( $cap );
+
+	unset( $capability );
 }
 
 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
 
 // $menu[5] = Posts.
 
-$menu[10]                      = array( __( 'Media' ), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' );
+$menu[10] = array( __( 'Media' ), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' );
+
 	$submenu['upload.php'][5]  = array( __( 'Library' ), 'upload_files', 'upload.php' );
 	$submenu['upload.php'][10] = array( __( 'Add Media File' ), 'upload_files', 'media-new.php' );
-	$i                         = 15;
-foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) {
-	if ( ! $tax->show_ui || ! $tax->show_in_menu ) {
-		continue;
+	$submenu_index             = 15;
+
+foreach ( get_taxonomies_for_attachments( 'objects' ) as $taxonomy ) {
+	if ( ! $taxonomy->show_ui || ! $taxonomy->show_in_menu ) {
+			continue;
 	}
 
-	$submenu['upload.php'][ $i++ ] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&post_type=attachment' );
+	$submenu['upload.php'][ $submenu_index++ ] = array( esc_attr( $taxonomy->labels->menu_name ), $taxonomy->cap->manage_terms, 'edit-tags.php?taxonomy=' . $taxonomy->name . '&post_type=attachment' );
 }
-	unset( $tax, $i );
 
-$menu[15]                            = array( __( 'Links' ), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' );
+	unset( $taxonomy, $submenu_index );
+
+$menu[15] = array( __( 'Links' ), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' );
+
 	$submenu['link-manager.php'][5]  = array( _x( 'All Links', 'admin menu' ), 'manage_links', 'link-manager.php' );
 	$submenu['link-manager.php'][10] = array( __( 'Add Link' ), 'manage_links', 'link-add.php' );
 	$submenu['link-manager.php'][15] = array( __( 'Link Categories' ), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );
@@ -90,114 +96,124 @@
 
 // Avoid the comment count query for users who cannot edit_posts.
 if ( current_user_can( 'edit_posts' ) ) {
-	$awaiting_mod      = wp_count_comments();
-	$awaiting_mod      = $awaiting_mod->moderated;
-	$awaiting_mod_i18n = number_format_i18n( $awaiting_mod );
+	$awaiting_moderation      = wp_count_comments();
+	$awaiting_moderation      = $awaiting_moderation->moderated;
+	$awaiting_moderation_i18n = number_format_i18n( $awaiting_moderation );
 	/* translators: %s: Number of comments. */
-	$awaiting_mod_text = sprintf( _n( '%s Comment in moderation', '%s Comments in moderation', $awaiting_mod ), $awaiting_mod_i18n );
+	$awaiting_moderation_text = sprintf( _n( '%s Comment in moderation', '%s Comments in moderation', $awaiting_moderation ), $awaiting_moderation_i18n );
 
 	$menu[25] = array(
 		/* translators: %s: Number of comments. */
-		sprintf( __( 'Comments %s' ), '<span class="awaiting-mod count-' . absint( $awaiting_mod ) . '"><span class="pending-count" aria-hidden="true">' . $awaiting_mod_i18n . '</span><span class="comments-in-moderation-text screen-reader-text">' . $awaiting_mod_text . '</span></span>' ),
+		sprintf( __( 'Comments %s' ), '<span class="awaiting-mod count-' . absint( $awaiting_moderation ) . '"><span class="pending-count" aria-hidden="true">' . $awaiting_moderation_i18n . '</span><span class="comments-in-moderation-text screen-reader-text">' . $awaiting_moderation_text . '</span></span>' ),
 		'edit_posts',
 		'edit-comments.php',
 		'',
 		'menu-top menu-icon-comments',
 		'menu-comments',
 		'dashicons-admin-comments',
 	);
-	unset( $awaiting_mod );
+
+	unset( $awaiting_moderation );
 }
 
 $submenu['edit-comments.php'][0] = array( __( 'All Comments' ), 'edit_posts', 'edit-comments.php' );
 
 $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group.
 
-$types   = (array) get_post_types(
+$post_types = (array) get_post_types(
 	array(
 		'show_ui'      => true,
 		'_builtin'     => false,
 		'show_in_menu' => true,
 	)
 );
-$builtin = array( 'post', 'page' );
-foreach ( array_merge( $builtin, $types ) as $ptype ) {
-	$ptype_obj = get_post_type_object( $ptype );
+$builtin    = array( 'post', 'page' );
+
+foreach ( array_merge( $builtin, $post_types ) as $post_type ) {
+	$post_type_obj = get_post_type_object( $post_type );
+
 	// Check if it should be a submenu.
-	if ( true !== $ptype_obj->show_in_menu ) {
+	if ( true !== $post_type_obj->show_in_menu ) {
 		continue;
 	}
-	$ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
-	$ptype_for_id        = sanitize_html_class( $ptype );
+
+	$post_type_menu_position = is_int( $post_type_obj->menu_position )
+		? $post_type_obj->menu_position
+		: ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
+	$post_type_for_id        = sanitize_html_class( $post_type );
 
 	$menu_icon = 'dashicons-admin-post';
-	if ( is_string( $ptype_obj->menu_icon ) ) {
+	if ( is_string( $post_type_obj->menu_icon ) ) {
 		// Special handling for an empty div.wp-menu-image, data:image/svg+xml, and Dashicons.
-		if ( 'none' === $ptype_obj->menu_icon || 'div' === $ptype_obj->menu_icon
-			|| str_starts_with( $ptype_obj->menu_icon, 'data:image/svg+xml;base64,' )
-			|| str_starts_with( $ptype_obj->menu_icon, 'dashicons-' )
+		if ( 'none' === $post_type_obj->menu_icon || 'div' === $post_type_obj->menu_icon
+			|| str_starts_with( $post_type_obj->menu_icon, 'data:image/svg+xml;base64,' )
+			|| str_starts_with( $post_type_obj->menu_icon, 'dashicons-' )
 		) {
-			$menu_icon = $ptype_obj->menu_icon;
+			$menu_icon = $post_type_obj->menu_icon;
 		} else {
-			$menu_icon = esc_url( $ptype_obj->menu_icon );
+			$menu_icon = esc_url( $post_type_obj->menu_icon );
 		}
-	} elseif ( in_array( $ptype, $builtin, true ) ) {
-		$menu_icon = 'dashicons-admin-' . $ptype;
+	} elseif ( in_array( $post_type, $builtin, true ) ) {
+		$menu_icon = 'dashicons-admin-' . $post_type;
 	}
 
-	$menu_class = 'menu-top menu-icon-' . $ptype_for_id;
+	$menu_class = 'menu-top menu-icon-' . $post_type_for_id;
 	// 'post' special case.
-	if ( 'post' === $ptype ) {
+	if ( 'post' === $post_type ) {
 		$menu_class    .= ' open-if-no-js';
-		$ptype_file     = 'edit.php';
+		$post_type_file = 'edit.php';
 		$post_new_file  = 'post-new.php';
 		$edit_tags_file = 'edit-tags.php?taxonomy=%s';
 	} else {
-		$ptype_file     = "edit.php?post_type=$ptype";
-		$post_new_file  = "post-new.php?post_type=$ptype";
-		$edit_tags_file = "edit-tags.php?taxonomy=%s&amp;post_type=$ptype";
+		$post_type_file = "edit.php?post_type=$post_type";
+		$post_new_file  = "post-new.php?post_type=$post_type";
+		$edit_tags_file = "edit-tags.php?taxonomy=%s&amp;post_type=$post_type";
 	}
 
-	if ( in_array( $ptype, $builtin, true ) ) {
-		$ptype_menu_id = 'menu-' . $ptype_for_id . 's';
+	if ( in_array( $post_type, $builtin, true ) ) {
+		$post_type_menu_id = 'menu-' . $post_type_for_id . 's';
 	} else {
-		$ptype_menu_id = 'menu-posts-' . $ptype_for_id;
+		$post_type_menu_id = 'menu-posts-' . $post_type_for_id;
 	}
+
 	/*
-	 * If $ptype_menu_position is already populated or will be populated
+	 * If $post_type_menu_position is already populated or will be populated
 	 * by a hard-coded value below, increment the position.
 	 */
 	$core_menu_positions = array( 59, 60, 65, 70, 75, 80, 85, 99 );
-	while ( isset( $menu[ $ptype_menu_position ] ) || in_array( $ptype_menu_position, $core_menu_positions, true ) ) {
-		++$ptype_menu_position;
+	while ( isset( $menu[ $post_type_menu_position ] ) || in_array( $post_type_menu_position, $core_menu_positions, true ) ) {
+		++$post_type_menu_position;
 	}
 
-	$menu[ $ptype_menu_position ] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, $ptype_file, '', $menu_class, $ptype_menu_id, $menu_icon );
-	$submenu[ $ptype_file ][5]    = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, $ptype_file );
-	$submenu[ $ptype_file ][10]   = array( $ptype_obj->labels->add_new_item, $ptype_obj->cap->create_posts, $post_new_file );
+	$menu[ $post_type_menu_position ] = array( esc_attr( $post_type_obj->labels->menu_name ), $post_type_obj->cap->edit_posts, $post_type_file, '', $menu_class, $post_type_menu_id, $menu_icon );
+	$submenu[ $post_type_file ][5]    = array( $post_type_obj->labels->all_items, $post_type_obj->cap->edit_posts, $post_type_file );
+	$submenu[ $post_type_file ][10]   = array( $post_type_obj->labels->add_new_item, $post_type_obj->cap->create_posts, $post_new_file );
 
-	$i = 15;
-	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array( $ptype, (array) $tax->object_type, true ) ) {
+	$submenu_index = 15;
+
+	foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
+		if ( ! $taxonomy->show_ui || ! $taxonomy->show_in_menu || ! in_array( $post_type, (array) $taxonomy->object_type, true ) ) {
 			continue;
 		}
 
-		$submenu[ $ptype_file ][ $i++ ] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, sprintf( $edit_tags_file, $tax->name ) );
+		$submenu[ $post_type_file ][ $submenu_index++ ] = array( esc_attr( $taxonomy->labels->menu_name ), $taxonomy->cap->manage_terms, sprintf( $edit_tags_file, $taxonomy->name ) );
 	}
 }
-unset( $ptype, $ptype_obj, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax, $post_new_file );
+
+unset( $post_type, $post_type_obj, $post_type_for_id, $post_type_menu_position, $menu_icon, $submenu_index, $taxonomy, $post_new_file );
 
 $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );
 
-$appearance_cap = current_user_can( 'switch_themes' ) ? 'switch_themes' : 'edit_theme_options';
+$appearance_capability = current_user_can( 'switch_themes' ) ? 'switch_themes' : 'edit_theme_options';
 
-$menu[60] = array( __( 'Appearance' ), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
+$menu[60] = array( __( 'Appearance' ), $appearance_capability, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
 
 $count = '';
 if ( ! is_multisite() && current_user_can( 'update_themes' ) ) {
 	if ( ! isset( $update_data ) ) {
 		$update_data = wp_get_update_data();
 	}
+
 	$count = sprintf(
 		'<span class="update-plugins count-%s"><span class="theme-count">%s</span></span>',
 		$update_data['counts']['themes'],
@@ -206,7 +222,7 @@
 }
 
 	/* translators: %s: Number of available theme updates. */
-	$submenu['themes.php'][5] = array( sprintf( __( 'Themes %s' ), $count ), $appearance_cap, 'themes.php' );
+	$submenu['themes.php'][5] = array( sprintf( __( 'Themes %s' ), $count ), $appearance_capability, 'themes.php' );
 
 if ( wp_is_block_theme() ) {
 	$submenu['themes.php'][6] = array( _x( 'Editor', 'site editor menu item' ), 'edit_theme_options', 'site-editor.php' );
@@ -234,17 +250,15 @@
 
 if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize' ) ) {
 	$customize_header_url      = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url );
-	$submenu['themes.php'][15] = array( _x( 'Header', 'custom image header' ), $appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' );
+	$submenu['themes.php'][15] = array( _x( 'Header', 'custom image header' ), $appearance_capability, esc_url( $customize_header_url ), '', 'hide-if-no-customize' );
 }
 
 if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize' ) ) {
 	$customize_background_url  = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url );
-	$submenu['themes.php'][20] = array( _x( 'Background', 'custom background' ), $appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' );
+	$submenu['themes.php'][20] = array( _x( 'Background', 'custom background' ), $appearance_capability, esc_url( $customize_background_url ), '', 'hide-if-no-customize' );
 }
 
-unset( $customize_url );
-
-unset( $appearance_cap );
+unset( $customize_url, $appearance_capability );
 
 // Add 'Theme File Editor' to the bottom of the Appearance (non-block themes) or Tools (block themes) menu.
 if ( ! is_multisite() ) {

src/wp-admin/options-discussion.php

@@ -162,7 +162,7 @@
 <?php _e( 'A comment is held for moderation' ); ?> </label>
 <br />
 <label for="wp_notes_notify">
-<input name="wp_notes_notify" type="checkbox" id="wp_notes_notify" value="1" <?php checked( '1', get_option( 'wp_notes_notify' ) ); ?> />
+<input name="wp_notes_notify" type="checkbox" id="wp_notes_notify" value="1" <?php checked( '1', get_option( 'wp_notes_notify', 1 ) ); ?> />
 <?php _e( 'Anyone posts a note' ); ?> </label>
 
 </fieldset></td>

src/wp-admin/options-general.php

@@ -480,20 +480,11 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 
 foreach ( $date_formats as $format ) {
 	echo "\t<label><input type='radio' name='date_format' value='" . esc_attr( $format ) . "'";
-
 	if ( get_option( 'date_format' ) === $format ) { // checked() uses "==" rather than "===".
 		echo " checked='checked'";
 		$custom = false;
 	}
-
-	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span>' .
-		'<code>' . esc_html( $format ) . '</code>';
-
-	if ( __( 'F j, Y' ) === $format ) {
-		echo ' ' . __( '(Site language default)' );
-	}
-
-	echo "</label><br />\n";
+	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
 }
 
 	echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
@@ -534,20 +525,11 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 
 foreach ( $time_formats as $format ) {
 	echo "\t<label><input type='radio' name='time_format' value='" . esc_attr( $format ) . "'";
-
 	if ( get_option( 'time_format' ) === $format ) { // checked() uses "==" rather than "===".
 		echo " checked='checked'";
 		$custom = false;
 	}
-
-	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span>' .
-		'<code>' . esc_html( $format ) . '</code>';
-
-	if ( __( 'g:i a' ) === $format ) {
-		echo ' ' . __( '(Site language default)' );
-	}
-
-	echo "</label><br />\n";
+	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
 }
 
 	echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';