Replace locate_template method #28942
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
This was referenced Feb 11, 2021
oandregal
added
[Type] Code Quality
|
Size Change: 0 B Total Size: 1.37 MB ℹ️ View Unchanged
|
Soean
reviewed
Feb 11, 2021
|
Just curious, is there a reason we don't use |
I think the API in this PR is simpler to operate with: it either returns an empty string or a full path to a readable file, hence consumers don't need to check anything else than whether the result is an empty string (quick check). With |
|
Gotcha. Thanks for the explanation @nosolosw 👍 |
oandregal
force-pushed
the
replace/locate-template-method
branch
2 times, most recently
from
4c71a1d to
3f6d0cf
Compare
|
Some other things landed, so had to rebase. Welcome a 👍 ! |
oandregal
force-pushed
the
replace/locate-template-method
branch
from
3f6d0cf to
8e580e0
Compare
|
I've rebased this from master, there were some conflicts and also unrelated mobile test failures. Anyone can give this a 👍 if it looks good? |
aristath
reviewed
Feb 12, 2021
aristath
requested changes
Feb 12, 2021
oandregal
force-pushed
the
replace/locate-template-method
branch
from
8e580e0 to
7066f08
Compare
Soean
approved these changes
Feb 12, 2021
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.
Fixes #26359
Related #28410 (comment)
This PR replaces
locate_methodby building the file path ourselves by means ofget_stylesheet_directory. It also minimizes the number of times we check the file exists and is readable.This stems from this conversation and a bug report (while I couldn't reproduce, I understand that validates the idea that
locate_templateis unsafe in certain scenarios).Test