WordPress/wp-includes
audrasjb ddfe23a9aa Editor: Allow child theme PHP templates to take precedence over parent theme block templates.
This change fixes template resolution to give precedence to child theme PHP templates over parent theme block templates with equal specificity.

Before this change, when a theme was using a PHP template of a certain specificity (e.g. `page-home.php`), and it happened to be a child theme of another theme which had a block template for the same specificity (e.g. `page-home.html`), WordPress was picking the parent theme’s block template over the child theme’s PHP template to render the page. If the PHP and block template have equal specificity, the child theme's template should be used.

The issue was fixed before in Gutenberg so the fix now needs to happen in Core.

This change also re-enables the preexisting template resolution unit tests.

Follow-up to [51003].

Props bernhard-reiter, youknowriad.
Fixes #54515.

Built from https://develop.svn.wordpress.org/trunk@52308


git-svn-id: http://core.svn.wordpress.org/trunk@51900 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-12-02 23:36:59 +00:00
..
ID3 External Libraries: Update getID3 to version 1.9.21. 2021-11-26 03:06:03 +00:00
IXR
PHPMailer External Libraries: Upgrade PHPMailer to version 6.5.3. 2021-11-26 00:43:01 +00:00
Requests External Libraries: Update the Requests library to version 2.0.0. 2021-11-25 01:12:02 +00:00
SimplePie
Text
assets Update @wordpress packages 2021-11-30 05:48:28 +00:00
block-patterns Add Site Editor and PHP changes from Gutenberg 10.1 - 11.9 2021-11-09 02:17:17 +00:00
block-supports Docs: Miscellaneous Docblock corrections in several `/block-supports` files. 2021-12-01 23:16:04 +00:00
blocks Update @wordpress packages 2021-11-30 05:48:28 +00:00
certificates HTTP: Remove the DST Root CA X3 certificate expired on September 30, 2021. 2021-10-03 17:51:06 +00:00
css Update @wordpress packages 2021-11-30 05:48:28 +00:00
customize Docs: Remove instances of the “eg.” abbreviation in favor of “example” or “for example”. 2021-11-19 14:44:01 +00:00
fonts
images Coding Standards: Revert accidental image changes in [52171]. 2021-11-16 00:04:01 +00:00
js Media: Use `infiniteScrolling` global setting in `js/media/controllers/featured-image.js` and `js/media/controllers/replace-image.js`. 2021-11-30 19:07:00 +00:00
php-compat Docs: Improve documentation for a few functions per the documentation standards. 2021-08-10 13:45:57 +00:00
pomo Docs: Various docblock corrections. 2021-12-01 12:17:00 +00:00
random_compat
rest-api Site Editor: Add site export REST API endpoint. 2021-11-30 17:32:02 +00:00
sitemaps Docs: Various corrections and improvements relating to types used in inline documentation. 2021-11-18 13:50:05 +00:00
sodium_compat Upgrade/Install: Update sodium_compat to v1.17.0. 2021-08-10 13:04:57 +00:00
theme-compat Docs: Various corrections and improvements relating to types used in inline documentation. 2021-11-18 13:50:05 +00:00
widgets Widgets: Add filter to disable RSS widget icon. 2021-11-07 23:04:56 +00:00
admin-bar.php Editor: Fix how the Site Editor is linked to 2021-11-15 03:43:59 +00:00
atomlib.php
author-template.php Users: Escape `get_author_posts_url()` link in `wp_list_authors()`. 2021-06-21 06:06:57 +00:00
block-editor.php Update @wordpress packages 2021-11-30 00:24:27 +00:00
block-i18n.json Blocks: Add support for `variations in `block.json` file 2021-08-11 09:08:01 +00:00
block-patterns.php Editor: Ensure the Query block pattern category is translatable. 2021-07-02 14:35:58 +00:00
block-template-utils.php Site Editor: Add site export REST API endpoint. 2021-11-30 17:32:02 +00:00
block-template.php Editor: Allow child theme PHP templates to take precedence over parent theme block templates. 2021-12-02 23:36:59 +00:00
blocks.php Editor: Avoid a JS console error on the Navigation block view. 2021-11-30 20:02:01 +00:00
bookmark-template.php General: Add "noopener" to `wp_list_bookmarks()` output. 2021-11-08 23:06:58 +00:00
bookmark.php
cache-compat.php
cache.php
canonical.php
capabilities.php Users: Prevent infinite loop when using capability checks during `determine_current_user` on multisite. 2021-11-15 01:09:59 +00:00
category-template.php Docs: Various corrections and improvements relating to types used in inline documentation. 2021-11-18 13:50:05 +00:00
category.php
class-IXR.php
class-feed.php
class-http.php Coding Standards: Move `wp-includes/class-http.php` to `wp-includes/class-wp-http.php`. 2021-11-07 01:36:57 +00:00
class-json.php
class-oembed.php
class-phpass.php
class-phpmailer.php
class-pop3.php
class-requests.php External Libraries: Update the Requests library to version 2.0.0. 2021-11-25 01:12:02 +00:00
class-simplepie.php
class-smtp.php
class-snoopy.php
class-walker-category-dropdown.php Code Modernization: Fix last parameter name mismatches for parent/child classes in `Walker::start_el()`. 2021-09-09 12:39:59 +00:00
class-walker-category.php Taxonomy: Allow `get_*_*_link()` and `edit_term_link()` functions to accept a term ID, `WP_Term`, or term object. 2021-11-16 14:57:02 +00:00
class-walker-comment.php Code Modernization: Fix reserved keyword and parameter name mismatches for parent/child classes in `Walker::end_el()`. 2021-09-09 13:03:55 +00:00
class-walker-nav-menu.php Code Modernization: Fix reserved keyword and parameter name mismatches for parent/child classes in `Walker::end_el()`. 2021-09-09 13:03:55 +00:00
class-walker-page-dropdown.php Code Modernization: Fix last parameter name mismatches for parent/child classes in `Walker::start_el()`. 2021-09-09 12:39:59 +00:00
class-walker-page.php Code Modernization: Fix reserved keyword and parameter name mismatches for parent/child classes in `Walker::end_el()`. 2021-09-09 13:03:55 +00:00
class-wp-admin-bar.php Editor: Fix how the Site Editor is linked to 2021-11-15 03:43:59 +00:00
class-wp-ajax-response.php
class-wp-application-passwords.php Application Passwords: Various docblock improvements. 2021-10-30 20:26:59 +00:00
class-wp-block-editor-context.php
class-wp-block-list.php Code Modernization: Silence the deprecation warnings for missing return type in `WP_Block_List`. 2021-08-03 11:12:55 +00:00
class-wp-block-parser.php
class-wp-block-pattern-categories-registry.php Docs: Improve the documentation for registering block patterns and block pattern categories. 2021-11-19 19:05:59 +00:00
class-wp-block-patterns-registry.php Docs: Various docblock corrections and improvements. 2021-11-23 21:37:01 +00:00
class-wp-block-styles-registry.php Editor: Ensure block style name does not contain spaces before creating the class. 2021-11-28 13:53:00 +00:00
class-wp-block-supports.php Docs: Various docblock corrections and improvements. 2021-11-23 21:37:01 +00:00
class-wp-block-template.php Update @wordpress packages 2021-11-30 00:24:27 +00:00
class-wp-block-type-registry.php
class-wp-block-type.php Build: Split packages and blocks to their webpack configs 2021-07-28 10:06:59 +00:00
class-wp-block.php Docs: Various docblock corrections. 2021-12-01 12:17:00 +00:00
class-wp-comment-query.php Query: Correct and standardise the meta query documentation. 2021-11-20 00:07:59 +00:00
class-wp-comment.php
class-wp-customize-control.php Coding Standards: Escape `id` attributes in `WP_Customize_Control::render_content()` and `::print_template()`. 2021-10-22 16:09:59 +00:00
class-wp-customize-manager.php Docs: Various corrections and improvements relating to types used in inline documentation. 2021-11-18 13:50:05 +00:00
class-wp-customize-nav-menus.php Docs: Miscellaneous inline documentation improvements, including: 2021-10-04 20:44:02 +00:00
class-wp-customize-panel.php Docs: Replace `$this` in hook param docs with more appropriate names. 2021-07-30 19:35:58 +00:00
class-wp-customize-section.php Docs: Replace `$this` in hook param docs with more appropriate names. 2021-07-30 19:35:58 +00:00
class-wp-customize-setting.php Coding Standards: Add `public` visibility to methods in `src` directory. 2021-10-18 17:52:58 +00:00
class-wp-customize-widgets.php Widgets: Revert [51705]. 2021-09-09 21:40:57 +00:00
class-wp-date-query.php Docs: Update `WP_Date_Query` documentation to reflect changes in accepted column names. 2021-10-14 18:05:04 +00:00
class-wp-dependency.php
class-wp-editor.php Editor: Revert [51748] and [51649]. They intorduced a bug where `wp.editor` may be replaced with `wp.oldEditor` in certain cases. 2021-09-08 23:29:58 +00:00
class-wp-embed.php External Libraries: Further fix jQuery deprecations in WordPress core. 2021-11-30 17:18:01 +00:00
class-wp-error.php
class-wp-fatal-error-handler.php
class-wp-feed-cache-transient.php
class-wp-feed-cache.php
class-wp-hook.php Plugins: Correct the documented allowable types for to the `$callback` parameter of various hook related functions. 2021-12-01 13:22:01 +00:00
class-wp-http-cookie.php Docs: Miscellaneous docblock corrections and improvements. 2021-09-22 21:23:00 +00:00
class-wp-http-curl.php Coding Standards: Move `wp-includes/class-http.php` to `wp-includes/class-wp-http.php`. 2021-11-07 01:36:57 +00:00
class-wp-http-encoding.php Coding Standards: Rename the `$gzData` argument to `$gz_data` in `WP_Http_Encoding::compatible_gzinflate()`. 2021-11-12 23:51:59 +00:00
class-wp-http-ixr-client.php Coding Standards: Use strict comparison in `wp-includes/class-wp-http-ixr-client.php`. 2021-10-01 15:00:58 +00:00
class-wp-http-proxy.php Docs: Various docblock corrections. 2021-12-01 12:17:00 +00:00
class-wp-http-requests-hooks.php External Libraries: Update the Requests library to version 2.0.0. 2021-11-25 01:12:02 +00:00
class-wp-http-requests-response.php External Libraries: Update the Requests library to version 2.0.0. 2021-11-25 01:12:02 +00:00
class-wp-http-response.php
class-wp-http-streams.php Coding Standards: Move `wp-includes/class-http.php` to `wp-includes/class-wp-http.php`. 2021-11-07 01:36:57 +00:00
class-wp-http.php External Libraries: Update the Requests library to version 2.0.0. 2021-11-25 01:12:02 +00:00
class-wp-image-editor-gd.php Code Modernization: Fix parameter name mismatches for parent/child classes in `WP_Image_Editor::save()`. 2021-09-09 20:39:58 +00:00
class-wp-image-editor-imagick.php Code Modernization: Fix parameter name mismatches for parent/child classes in `WP_Image_Editor::save()`. 2021-09-09 20:39:58 +00:00
class-wp-image-editor.php Docs: Fix some docblock syntax errors and add a missing canonical reference. 2021-11-08 10:44:59 +00:00
class-wp-list-util.php General: Convert `wp_list_filter()` into a wrapper for `wp_filter_object_list()`. 2021-11-09 01:10:59 +00:00
class-wp-locale-switcher.php
class-wp-locale.php
class-wp-matchesmapregex.php
class-wp-meta-query.php Docs: Various docblock corrections and improvements. 2021-11-23 21:37:01 +00:00
class-wp-metadata-lazyloader.php
class-wp-network-query.php Docs: Replace `$this` in hook param docs with more appropriate names. 2021-07-30 19:35:58 +00:00
class-wp-network.php
class-wp-object-cache.php
class-wp-oembed-controller.php
class-wp-oembed.php Embeds: Add Wolfram Notebook as a trusted oEmbed provider. 2021-10-15 05:04:56 +00:00
class-wp-paused-extensions-storage.php
class-wp-post-type.php Docs: Remove instances of the “eg.” abbreviation in favor of “example” or “for example”. 2021-11-19 14:44:01 +00:00
class-wp-post.php
class-wp-query.php Docs: Various docblock corrections. 2021-12-01 12:17:00 +00:00
class-wp-recovery-mode-cookie-service.php
class-wp-recovery-mode-email-service.php
class-wp-recovery-mode-key-service.php
class-wp-recovery-mode-link-service.php
class-wp-recovery-mode.php
class-wp-rewrite.php Docs: Replace `$this` in hook param docs with more appropriate names. 2021-07-30 19:35:58 +00:00
class-wp-role.php
class-wp-roles.php Docs: Replace `$this` in hook param docs with more appropriate names. 2021-07-30 19:35:58 +00:00
class-wp-session-tokens.php
class-wp-simplepie-file.php
class-wp-simplepie-sanitize-kses.php
class-wp-site-query.php Query: Correct and standardise the meta query documentation. 2021-11-20 00:07:59 +00:00
class-wp-site.php
class-wp-tax-query.php
class-wp-taxonomy.php Docs: Add a `@since` note for the `rest_namespace` argument of `register_post_type()` and `register_taxonomy()`. 2021-11-01 14:31:00 +00:00
class-wp-term-query.php Query: Correct and standardise the meta query documentation. 2021-11-20 00:07:59 +00:00
class-wp-term.php
class-wp-text-diff-renderer-inline.php
class-wp-text-diff-renderer-table.php
class-wp-theme-json-resolver.php Editor: Do not translate the title of "Custom Styles" specific posts. 2021-11-30 15:35:01 +00:00
class-wp-theme-json-schema.php Docs: Docblock typo correction in `WP_Theme_JSON_Schema`. 2021-12-02 20:45:01 +00:00
class-wp-theme-json.php Update @wordpress packages 2021-11-30 00:24:27 +00:00
class-wp-theme.php Docs: Use a duplicate hook reference for `theme_file_path` in `WP_Theme::get_file_path()`. 2021-12-01 09:20:04 +00:00
class-wp-user-meta-session-tokens.php
class-wp-user-query.php Query: Correct and standardise the meta query documentation. 2021-11-20 00:07:59 +00:00
class-wp-user-request.php
class-wp-user.php Docs: Miscellaneous docblock corrections and improvements. 2021-09-22 21:23:00 +00:00
class-wp-walker.php Docs: Remove instances of the “eg.” abbreviation in favor of “example” or “for example”. 2021-11-19 14:44:01 +00:00
class-wp-widget-factory.php Widgets: Fix widget preview not working if widget registered via a instance 2021-06-23 01:34:58 +00:00
class-wp-widget.php Widgets: Use `isset()` in `WP_Widget:: display_callback()` to support `ArrayIterator` and `ArrayObject`. 2021-11-16 01:43:00 +00:00
class-wp-xmlrpc-server.php Coding Standards: Move `wp-includes/class-http.php` to `wp-includes/class-wp-http.php`. 2021-11-07 01:36:57 +00:00
class-wp.php Code Modernization: Check the return type of `parse_url()` in `WP::parse_request()`. 2021-08-16 20:17:57 +00:00
class.wp-dependencies.php Docs: Miscellaneous docblock corrections and improvements. 2021-09-22 21:23:00 +00:00
class.wp-scripts.php Docs: Replace `$this` in hook param docs with more appropriate names. 2021-07-30 19:35:58 +00:00
class.wp-styles.php Docs: Replace `$this` in hook param docs with more appropriate names. 2021-07-30 19:35:58 +00:00
comment-template.php Comments: Fix PHP Notice "trying to get property of non-object" in `comments_open()` and `pings_open()`. 2021-11-19 20:24:00 +00:00
comment.php Docs: Various docblock corrections. 2021-12-01 12:17:00 +00:00
compat.php General: Introduce polyfills for `str_ends_with()` and `str_starts_with()` added in PHP 8.0. 2021-11-08 14:22:57 +00:00
cron.php Docs: Various docblock corrections and improvements. 2021-11-23 21:37:01 +00:00
date.php
default-constants.php Themes: Twenty Twenty-Two is now the default theme. 2021-11-10 00:41:00 +00:00
default-filters.php Editor: Remove Navigation Areas 2021-11-29 22:06:01 +00:00
default-widgets.php
deprecated.php General: Restore (un-deprecate) the `sanitize_url()` function. 2021-08-10 19:44:59 +00:00
embed-template.php
embed.php Embeds: Fix parsing of post embeds in `wp_filter_oembed_result()` by appending `wp-embed` script instead of prepending it in `get_post_embed_html()`. 2021-11-13 07:28:00 +00:00
error-protection.php
feed-atom-comments.php
feed-atom.php Feeds: Remove reference to `wp-atom.php` in Atom feeds `xml:base` attribute. 2021-11-29 09:52:00 +00:00
feed-rdf.php
feed-rss.php
feed-rss2-comments.php
feed-rss2.php
feed.php
formatting.php Options, Meta APIs: Improve error handling in `sanitize_option()`. 2021-11-30 21:03:00 +00:00
functions.php Docs: Remove instances of the “eg.” abbreviation in favor of “example” or “for example”. 2021-11-19 14:44:01 +00:00
functions.wp-scripts.php Docs: Provide a more accurate description for a few script and style functions. 2021-09-02 08:30:58 +00:00
functions.wp-styles.php Script Loader: Document `path` as an accepted value for `$key` in `wp_style_add_data()`. 2021-11-19 15:14:00 +00:00
general-template.php Template: Fix "undefined index: 00" when archive month query is empty in `wp_title()`. 2021-11-11 16:29:00 +00:00
global-styles-and-settings.php Update @wordpress packages 2021-11-30 00:24:27 +00:00
http.php External Libraries: Update the Requests library to version 2.0.0. 2021-11-25 01:12:02 +00:00
https-detection.php
https-migration.php
kses.php KSES: Allow attributes to be restricted via callbacks. 2021-12-02 00:56:01 +00:00
l10n.php Coding Standards: Minor alignment fix after [52058]. 2021-11-09 18:51:02 +00:00
link-template.php Taxonomy: Check $term object before using it in `get_term_feed_link()`. 2021-11-27 15:23:59 +00:00
load.php Bootstrap/Load: Check `$_SERVER['SCRIPT_NAME']` exists before passing to `strpos()` in `wp_fix_server_vars()`. 2021-11-12 01:10:01 +00:00
locale.php
media-template.php Media: Move dismiss upload errors button after errors. 2021-11-17 15:56:03 +00:00
media.php Docs: Various docblock corrections. 2021-12-01 12:17:00 +00:00
meta.php Options, Meta APIs: Correct docs for `$_meta_value` parameter in `xxx_{$meta_type}_meta` hooks. 2021-11-11 18:32:00 +00:00
ms-blogs.php
ms-default-constants.php Code Modernization: Check the return type of `parse_url()` in `ms_cookie_constants()`. 2021-08-17 22:08:57 +00:00
ms-default-filters.php Posts, Post Types: Multisite: Decrement `post_count` option value when a post is deleted. 2021-11-18 15:11:59 +00:00
ms-deprecated.php
ms-files.php Multisite: Log error/warnings/notices from `ms-files.php`. 2021-07-06 20:21:57 +00:00
ms-functions.php Docs: Various docblock corrections. 2021-12-01 12:17:00 +00:00
ms-load.php
ms-network.php
ms-settings.php
ms-site.php Docs: Corrections relating to types used in inline documentation for comment ID and site ID proprties. 2021-11-18 13:57:01 +00:00
nav-menu-template.php
nav-menu.php REST API: Fire `wp_after_insert_post` later in new post object endpoints. 2021-11-30 01:10:08 +00:00
option.php Docs: Various docblock improvements and corrections. 2021-11-08 10:48:59 +00:00
pluggable-deprecated.php
pluggable.php Docs: Add missing `null` allowed type for the `$id` parameter of `wp_set_current_user()`. 2021-11-18 16:04:00 +00:00
plugin.php Plugins: Correct the documented allowable types for to the `$callback` parameter of various hook related functions. 2021-12-01 13:22:01 +00:00
post-formats.php
post-template.php Docs: Various corrections and improvements relating to types used in inline documentation. 2021-11-18 13:50:05 +00:00
post-thumbnail-template.php Docs: Various corrections and improvements relating to types used in inline documentation. 2021-11-18 13:50:05 +00:00
post.php Update @wordpress packages 2021-11-30 00:24:27 +00:00
query.php
registration-functions.php
registration.php
rest-api.php Site Editor: Add site export REST API endpoint. 2021-11-30 17:32:02 +00:00
revision.php Revisions: Introduce `wp_get_post_revisions_url()` to get URL for editing revisions. 2021-11-10 01:26:59 +00:00
rewrite.php
robots-template.php
rss-functions.php
rss.php
script-loader.php External Libraries: Further fix jQuery deprecations in WordPress core. 2021-11-30 17:18:01 +00:00
session.php
shortcodes.php
sitemaps.php
spl-autoload-compat.php
taxonomy.php Docs: Various docblock corrections. 2021-12-01 12:17:00 +00:00
template-canvas.php Add Site Editor and PHP changes from Gutenberg 10.1 - 11.9 2021-11-09 02:17:17 +00:00
template-loader.php
template.php
theme-i18n.json Update theme.json classes for WordPress 5.9. 2021-11-08 19:19:58 +00:00
theme-templates.php Docs: Add missing `@param` to `wp_set_unique_slug_on_create_template_part()`. 2021-12-02 00:01:00 +00:00
theme.json Update @wordpress packages 2021-11-30 00:24:27 +00:00
theme.php Media: Allow setting custom image alt text in custom header image. 2021-11-26 22:56:02 +00:00
update.php Upgrade/Install: Correct the weekly cron event for clearing the `temp-backup` directory: 2021-11-16 22:19:59 +00:00
user.php Coding Standards: Revert unrelated change to `wp_send_user_request()`. 2021-11-09 16:22:58 +00:00
vars.php
version.php Editor: Allow child theme PHP templates to take precedence over parent theme block templates. 2021-12-02 23:36:59 +00:00
widgets.php Docs: Various corrections and improvements relating to types used in inline documentation. 2021-11-18 13:50:05 +00:00
wlwmanifest.xml
wp-db.php Options, Meta APIs: Improve error handling in `sanitize_option()`. 2021-11-30 21:03:00 +00:00
wp-diff.php