Merge branch 'trunk' into block_styles_on_demand_in_classic_themes

Author: peterwilsoncc

src/wp-admin/includes/plugin.php

@@ -1247,7 +1247,20 @@ function validate_plugin_requirements( $plugin ) {
 		);
 	}
 
-	return true;
+	/**
+	 * Filters the plugin requirement validation response.
+	 *
+	 * If a plugin fails due to a Core-provided validation (incompatible WP, PHP versions), this
+	 * filter will not fire. A WP_Error response will already be returned.
+	 *
+	 * This filter is intended to add additional validation steps by site administrators.
+	 *
+	 * @since 6.9.0
+	 *
+	 * @param bool|WP_Error $met_requirements True if the plugin meets requirements, WP_Error if not.
+	 * @param string $plugin Path to the plugin file relative to the plugins directory.
+	 */
+	return apply_filters( 'validate_plugin_requirements', true, $plugin );
 }
 
 /**

src/wp-includes/template.php

@@ -323,21 +323,24 @@ function get_tag_template() {
  * The hierarchy for this template looks like:
  *
  * 1. taxonomy-{taxonomy_slug}-{term_slug}.php
- * 2. taxonomy-{taxonomy_slug}.php
- * 3. taxonomy.php
+ * 2. taxonomy-{taxonomy_slug}-{term_id}.php
+ * 3. taxonomy-{taxonomy_slug}.php
+ * 4. taxonomy.php
  *
  * An example of this is:
  *
  * 1. taxonomy-location-texas.php
- * 2. taxonomy-location.php
- * 3. taxonomy.php
+ * 2. taxonomy-location-67.php
+ * 3. taxonomy-location.php
+ * 4. taxonomy.php
  *
  * The template hierarchy and template path are filterable via the {@see '$type_template_hierarchy'}
  * and {@see '$type_template'} dynamic hooks, where `$type` is 'taxonomy'.
  *
  * @since 2.5.0
  * @since 4.7.0 The decoded form of `taxonomy-{taxonomy_slug}-{term_slug}.php` was added to the top of the
  *              template hierarchy when the term slug contains multibyte characters.
+ * @since 6.9.0 Added `taxonomy-{taxonomy_slug}-{term_id}.php` to the hierarchy.
  *
  * @see get_query_template()
  *
@@ -357,6 +360,7 @@ function get_taxonomy_template() {
 		}
 
 		$templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
+		$templates[] = "taxonomy-$taxonomy-{$term->term_id}.php";
 		$templates[] = "taxonomy-$taxonomy.php";
 	}
 	$templates[] = 'taxonomy.php';

src/wp-includes/theme.php

@@ -1002,7 +1002,20 @@ function validate_theme_requirements( $stylesheet ) {
 		);
 	}
 
-	return true;
+	/**
+	 * Filters the theme requirement validation response.
+	 *
+	 * If a theme fails due to a Core-provided validation (incompatible WP, PHP versions), this
+	 * filter will not fire. A WP_Error response will already be returned.
+	 *
+	 * This filter is intended to add additional validation steps by site administrators.
+	 *
+	 * @since 6.9.0
+	 *
+	 * @param bool|WP_Error $met_requirements True if the theme meets requirements, WP_Error if not.
+	 * @param string $stylesheet Directory name for the theme.
+	 */
+	return apply_filters( 'validate_theme_requirements', true, $stylesheet );
 }
 
 /**

src/wp-includes/user.php

@@ -1196,7 +1196,6 @@ function is_user_member_of_blog( $user_id = 0, $blog_id = 0 ) {
 		return false;
 	}
 
-
 	if ( 1 === $blog_id ) {
 		$capabilities_key = $wpdb->base_prefix . 'capabilities';
 	} else {

tests/phpunit/tests/theme.php

@@ -1529,4 +1529,54 @@ public function test_switch_to_blog_uses_original_template_path() {
 
 		$this->assertSame( $template_path, $new_template_path, 'Switching blogs switches the template path' );
 	}
+
+	/**
+	 * Verify the validate_theme_requirements theme responds as expected for twentyten.
+	 *
+	 * @ticket 54381
+	 */
+	public function test_validate_theme_requirements_filter_default() {
+		// Default expectation since twentyten has the least strict requirements.
+		$this->assertTrue( validate_theme_requirements( 'twentyten' ) );
+	}
+
+	/**
+	 * Verify that a filtered failure of validate_theme_requirements returns WP_Error
+	 *
+	 * @ticket 54381
+	 */
+	public function test_validate_theme_requirements_filter_error() {
+		// Adds an extra requirement that always fails.
+		add_filter(
+			'validate_theme_requirements',
+			function () {
+				return new WP_Error( 'theme_test_failed_requirement' );
+			}
+		);
+
+		$this->assertInstanceOf( 'WP_Error', validate_theme_requirements( 'twentyten' ) );
+	}
+
+	/**
+	 * Verify that the theme is passed through to the validate_theme_requirements filter by selectively erroring.
+	 *
+	 * @ticket 54381
+	 */
+	public function test_validate_theme_requirements_filter_selective_failure() {
+		// Adds an extra requirement only for a particular theme.
+		add_filter(
+			'validate_theme_requirements',
+			function ( $met_requirements, $stylesheet ) {
+				if ( 'twentytwenty' === $stylesheet ) {
+					return new WP_Error( 'theme_test_failed_requirement' );
+				}
+				return $met_requirements;
+			},
+			10,
+			2
+		);
+
+		$this->assertTrue( validate_theme_requirements( 'twentyten' ) );
+		$this->assertInstanceOf( 'WP_Error', validate_theme_requirements( 'twentytwenty' ) );
+	}
 }