Merge branch 'WordPress:trunk' into dependencies-tab

.github/workflows/coding-standards.yml

@@ -9,8 +9,9 @@ on:
       - '3.[89]'
       - '[4-9].[0-9]'
     tags:
-      - '3.[89]*'
-      - '[4-9].[0-9]*'
+      - '[0-9]+.[0-9]'
+      - '[0-9]+.[0-9].[0-9]+'
+      - '!3.7.[0-9]+'
   pull_request:
     branches:
       - trunk

.github/workflows/end-to-end-tests.yml

@@ -8,8 +8,10 @@ on:
       - '5.[3-9]'
       - '[6-9].[0-9]'
     tags:
-      - '5.[3-9]*'
-      - '[6-9].[0-9]*'
+      - '[0-9]+.[0-9]'
+      - '[0-9]+.[0-9].[0-9]+'
+      - '![34].[0-9].[0-9]+'
+      - '!5.[0-2].[0-9]+'
   pull_request:
     branches:
       - trunk

.github/workflows/javascript-tests.yml

@@ -8,8 +8,9 @@ on:
       - '3.[89]'
       - '[4-9].[0-9]'
     tags:
-      - '3.[89]*'
-      - '[4-9].[0-9]*'
+      - '[0-9]+.[0-9]'
+      - '[0-9]+.[0-9].[0-9]+'
+      - '!3.7.[0-9]+'
   pull_request:
     branches:
       - trunk

.github/workflows/php-compatibility.yml

@@ -8,8 +8,10 @@ on:
       - '5.[5-9]'
       - '[6-9].[0-9]'
     tags:
-      - '5.[5-9]*'
-      - '[6-9].[0-9]*'
+      - '[0-9]+.[0-9]'
+      - '[0-9]+.[0-9].[0-9]+'
+      - '![34].[0-9].[0-9]+'
+      - '!5.[0-4].[0-9]+'
   pull_request:
     branches:
       - trunk

.github/workflows/phpunit-tests.yml

@@ -7,8 +7,8 @@ on:
       - '3.[7-9]'
       - '[4-9].[0-9]'
     tags:
-      - '3.[7-9]*'
-      - '[4-9].[0-9]*'
+      - '[0-9]+.[0-9]'
+      - '[0-9]+.[0-9].[0-9]+'
   pull_request:
     branches:
       - trunk

.github/workflows/slack-notifications.yml

@@ -84,7 +84,7 @@ jobs:
             });
 
             // This is the first workflow run for this branch or tag.
-            if ( previous_runs.data.workflow_runs.length == 0 ) {
+            if ( previous_runs.data.workflow_runs.length < 2 ) {
               return 'none';
             }
 

.github/workflows/test-npm.yml

@@ -6,6 +6,9 @@ on:
       - trunk
       - '3.[7-9]'
       - '[4-9].[0-9]'
+    tags:
+      - '[0-9]+.[0-9]'
+      - '[0-9]+.[0-9].[0-9]+'
   pull_request:
     branches:
       - trunk

package.json

@@ -144,7 +144,7 @@
 		"jquery-hoverintent": "1.10.2",
 		"lodash": "4.17.21",
 		"masonry-layout": "4.2.2",
-		"moment": "2.29.3",
+		"moment": "2.29.4",
 		"objectFitPolyfill": "2.3.5",
 		"polyfill-library": "4.0.0",
 		"react": "17.0.2",

phpcompat.xml.dist

@@ -84,6 +84,6 @@
 
 	<!-- Whitelist the WP DB Class for use of `mysql_` extension in PHP < 7.0. -->
 	<rule ref="PHPCompatibility.Extensions.RemovedExtensions.mysql_DeprecatedRemoved">
-		<exclude-pattern>/src/wp-includes/wp-db\.php</exclude-pattern>
+		<exclude-pattern>/src/wp-includes/class-wpdb\.php</exclude-pattern>
 	</rule>
 </ruleset>

phpcs.xml.dist

@@ -165,7 +165,7 @@
 
 	<!-- Whitelist the WP DB Class and related tests for usage of direct database access functions. -->
 	<rule ref="WordPress.DB.RestrictedFunctions">
-		<exclude-pattern>/src/wp-includes/wp-db\.php</exclude-pattern>
+		<exclude-pattern>/src/wp-includes/class-wpdb\.php</exclude-pattern>
 		<exclude-pattern>/tests/phpunit/tests/db/charset\.php</exclude-pattern>
 	</rule>
 
@@ -325,10 +325,10 @@
 	</rule>
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCapital">
 		<exclude-pattern>/src/wp-admin/includes/class-wp-list-table-compat\.php</exclude-pattern>
+		<exclude-pattern>/src/wp-includes/class-wp-dependency\.php</exclude-pattern>
 		<exclude-pattern>/src/wp-includes/class-wp-editor\.php</exclude-pattern>
 		<exclude-pattern>/src/wp-includes/class-wp-xmlrpc-server\.php</exclude-pattern>
-		<exclude-pattern>/src/wp-includes/wp-db\.php</exclude-pattern>
-		<exclude-pattern>/src/wp-includes/class-wp-dependency\.php</exclude-pattern>
+		<exclude-pattern>/src/wp-includes/class-wpdb\.php</exclude-pattern>
 	</rule>
 
 	<!-- Exclude some incorrectly named files that won't be renamed. -->

src/js/_enqueues/vendor/plupload/handlers.js

@@ -486,7 +486,7 @@ jQuery( document ).ready( function( $ ) {
 
 		times = tryAgainCount[ file.id ];
 
-		if ( times && times > 4 ) {
+		if ( times && times > 8 ) {
 			/*
 			 * The file may have been uploaded and attachment post created,
 			 * but post-processing and resizing failed...

src/js/_enqueues/vendor/plupload/wp-plupload.js

@@ -138,7 +138,7 @@ window.wp = window.wp || {};
 
 			times = tryAgainCount[ file.id ];
 
-			if ( times && times > 4 ) {
+			if ( times && times > 8 ) {
 				/*
 				 * The file may have been uploaded and attachment post created,
 				 * but post-processing and resizing failed...

src/wp-admin/css/admin-menu.css

@@ -36,108 +36,21 @@
 	width: 36px;
 }
 
-.icon16 {
-	height: 18px;
-	width: 18px;
-	padding: 6px;
-	margin: -6px 0 0 -8px;
-	float: left;
-}
-
 /* New Menu icons */
 
-.icon16:before {
-	color: #8c8f94; /* same as new icons */
-	font: normal 20px/1 dashicons;
-	speak: never;
-	padding: 6px 0;
-	height: 34px;
-	width: 20px;
-	display: inline-block;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	transition: all .1s ease-in-out;
-}
-
-.icon16.icon-dashboard:before {
-	content: "\f226";
-}
-
-.icon16.icon-post:before {
-	content: "\f109";
-}
-
-.icon16.icon-media:before {
-	content: "\f104";
-}
-
-.icon16.icon-links:before {
-	content: "\f103";
-}
-
-.icon16.icon-page:before {
-	content: "\f105";
-}
-
-.icon16.icon-comments:before {
-	content: "\f101";
-	margin-top: 1px;
-}
-
-.icon16.icon-appearance:before {
-	content: "\f100";
-}
-
-.icon16.icon-plugins:before {
-	content: "\f106";
-}
-
-.icon16.icon-users:before {
-	content: "\f110";
-}
-
-.icon16.icon-tools:before {
-	content: "\f107";
-}
-
-.icon16.icon-settings:before {
-	content: "\f108";
-}
-
-.icon16.icon-site:before {
-	content: "\f541";
-}
-
-.icon16.icon-generic:before {
-	content: "\f111";
-}
-
 /* hide background-image for icons above */
-.icon16.icon-dashboard,
 .menu-icon-dashboard div.wp-menu-image,
-.icon16.icon-post,
 .menu-icon-post div.wp-menu-image,
-.icon16.icon-media,
 .menu-icon-media div.wp-menu-image,
-.icon16.icon-links,
 .menu-icon-links div.wp-menu-image,
-.icon16.icon-page,
 .menu-icon-page div.wp-menu-image,
-.icon16.icon-comments,
 .menu-icon-comments div.wp-menu-image,
-.icon16.icon-appearance,
 .menu-icon-appearance div.wp-menu-image,
-.icon16.icon-plugins,
 .menu-icon-plugins div.wp-menu-image,
-.icon16.icon-users,
 .menu-icon-users div.wp-menu-image,
-.icon16.icon-tools,
 .menu-icon-tools div.wp-menu-image,
-.icon16.icon-settings,
 .menu-icon-settings div.wp-menu-image,
-.icon16.icon-site,
 .menu-icon-site div.wp-menu-image,
-.icon16.icon-generic,
 .menu-icon-generic div.wp-menu-image {
 	background-image: none !important;
 }

src/wp-admin/css/common.css

@@ -949,6 +949,7 @@ a#remove-post-thumbnail:hover,
 	padding: 6px 10px 8px;
 }
 
+.word-wrap-break-word,
 .misc-pub-filename {
 	word-wrap: break-word;
 }

src/wp-admin/css/forms.css

@@ -1130,6 +1130,11 @@ table.form-table td .updated p {
 	max-width: 60%;
 }
 
+.configuration-rules-label {
+	font-weight: 600;
+	margin-bottom: 4px;
+}
+
 /*------------------------------------------------------------------------------
    Credentials check dialog for Install and Updates
 ------------------------------------------------------------------------------*/

src/wp-admin/css/list-tables.css

@@ -1344,7 +1344,7 @@ ul.cat-checklist {
 }
 
 .plugins tr.paused th.check-column {
-	border-left: 4px solid #d63638;
+	border-left: 4px solid #b32d2e;
 }
 
 .plugins tr.paused th,
@@ -1354,7 +1354,7 @@ ul.cat-checklist {
 
 .plugins tr.paused .plugin-title,
 .plugins .paused .dashicons-warning {
-	color: #d63638;
+	color: #b32d2e;
 }
 
 .plugins .paused .error-display p,
@@ -1364,7 +1364,7 @@ ul.cat-checklist {
 }
 
 .plugins .resume-link {
-	color: #d63638;
+	color: #b32d2e;
 }
 
 .plugin-card .update-now:before {

src/wp-admin/includes/ajax-actions.php

@@ -162,6 +162,17 @@ function wp_ajax_ajax_tag_search() {
 		)
 	);
 
+	/**
+	 * Filters the Ajax term search results.
+	 *
+	 * @since 6.1.0
+	 *
+	 * @param string[]    $results Array of term names.
+	 * @param WP_Taxonomy $tax     The taxonomy object.
+	 * @param string      $s       The search term.
+	 */
+	$results = apply_filters( 'ajax_term_search_results', $results, $tax, $s );
+
 	echo implode( "\n", $results );
 	wp_die();
 }
@@ -1297,12 +1308,10 @@ function wp_ajax_replyto_comment( $action ) {
 	$user = wp_get_current_user();
 
 	if ( $user->exists() ) {
-		$user_ID              = $user->ID;
 		$comment_author       = wp_slash( $user->display_name );
 		$comment_author_email = wp_slash( $user->user_email );
 		$comment_author_url   = wp_slash( $user->user_url );
-		$comment_content      = trim( $_POST['content'] );
-		$comment_type         = isset( $_POST['comment_type'] ) ? trim( $_POST['comment_type'] ) : 'comment';
+		$user_id              = $user->ID;
 
 		if ( current_user_can( 'unfiltered_html' ) ) {
 			if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) ) {
@@ -1320,10 +1329,14 @@ function wp_ajax_replyto_comment( $action ) {
 		wp_die( __( 'Sorry, you must be logged in to reply to a comment.' ) );
 	}
 
+	$comment_content = trim( $_POST['content'] );
+
 	if ( '' === $comment_content ) {
 		wp_die( __( 'Please type your comment text.' ) );
 	}
 
+	$comment_type = isset( $_POST['comment_type'] ) ? trim( $_POST['comment_type'] ) : 'comment';
+
 	$comment_parent = 0;
 
 	if ( isset( $_POST['comment_ID'] ) ) {
@@ -1343,7 +1356,7 @@ function wp_ajax_replyto_comment( $action ) {
 		'comment_content',
 		'comment_type',
 		'comment_parent',
-		'user_ID'
+		'user_id'
 	);
 
 	// Automatically approve parent comment.