Fix for template order logic bug introduced in 10.5 #31478
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vdwijngaert
changed the title
|
Size Change: 0 B Total Size: 1.31 MB ℹ️ View Unchanged
|
IIRC, However, see my notes in the issue: #31399 (comment) and #31399 (comment) (tl;dr -- we should make sure we understand the problem and all of the relevant parts of the code, and might be able to simplify the logic further to make it easier to reason about). |
ockham
approved these changes
May 4, 2021
There was a problem hiding this comment.
Let's actually go with this solution for now -- see #31399 (comment) for the rationale.
Thanks for the fix, @vdwijngaert ✨
|
Oh, wasn't expecting this to go through, but it's probably for the best. Just did some more tests, and as suspected, this needed some tweaking to account for templates from both parent and child themes. Last commit should do the trick. I'd be happy to help review the refactor and accompanying unit tests, so feel free to ping me then. |
vdwijngaert
changed the title
vdwijngaert
changed the title
youknowriad
approved these changes
May 5, 2021
youknowriad
added
the
[Type] Bug
youknowriad
pushed a commit
that referenced
this pull request
May 5, 2021
* Fixes template basename issue * Account for templates of both parent and child themes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WIP PR that fixes #31399.
The original code uses
basenameto determine a template's slug, but that doesn't take a template in a subdirectory into account. For at least the basic cases, it appears to be enough to strip theget_stylesheet_directory()from the path (and remove the php extension).not sure whether to use
get_template_directoryorget_stylesheet_directory, or both to make it work for child themes as well, need to test that.