Editor: Fix block template files query for a post-type #6468
Conversation
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the Core Committers: Use this line as a base for the props when committing in SVN: To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
Test using WordPress PlaygroundThe changes in this pull request can previewed and tested using a WordPress Playground instance. WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser. Some things to be aware of
For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation. |
| if ( | ||
| ! $post_type || | ||
| ( $post_type && isset( $candidate['postTypes'] ) && in_array( $post_type, $candidate['postTypes'], true ) ) | ||
| ) { | ||
| $template_files[ $template_slug ] = $candidate; | ||
| } | ||
|
|
||
| if ( $post_type && ! isset( $candidate['postTypes'] ) && $is_custom ) { | ||
| $template_files[ $template_slug ] = $candidate; | ||
| } |
There was a problem hiding this comment.
Can we combine two conditions with OR?
There was a problem hiding this comment.
I think it's easier to parse this way. I see no reason to sacrifice readability for an extra few lines.
There was a problem hiding this comment.
The fix works for me, testing it I see that it matches the results from WordPress/gutenberg#61244
Let's add some comments in the custom-hero-template.html file and/or the tests that this template is intentionally excluded from theme.json, otherwise I might look at this in the future and wonder why it's missing from the customTemplates array.
|
Thanks for testing, @creativecoder! I added the explanatory comment for the data provider. P.S. Comment support for JSON would have been handy at this moment :) |
|
Hey hey @Mamaduka, are we only missing an approval? |
|
@vcanales that’s correct. |
|
Checking blame to find people to review 😄 |
See WordPress/gutenberg#61244. See #6468. Fixes #61110. Props mamaduka, mukesh27, grantmkin, vcanales, ellatrix, oandregal. git-svn-id: https://develop.svn.wordpress.org/trunk@58323 602fd350-edb4-49c9-b593-d223f7449a82
See WordPress/gutenberg#61244. See WordPress/wordpress-develop#6468. Fixes #61110. Props mamaduka, mukesh27, grantmkin, vcanales, ellatrix, oandregal. Built from https://develop.svn.wordpress.org/trunk@58323 git-svn-id: http://core.svn.wordpress.org/trunk@57780 1a063a9b-81f0-0310-95a4-ce76da25c4cd
See WordPress/gutenberg#61244. See WordPress/wordpress-develop#6468. Fixes #61110. Props mamaduka, mukesh27, grantmkin, vcanales, ellatrix, oandregal. Built from https://develop.svn.wordpress.org/trunk@58323 git-svn-id: https://core.svn.wordpress.org/trunk@57780 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Add a missing file for r58323. See #6468. See #61110. git-svn-id: https://develop.svn.wordpress.org/trunk@58324 602fd350-edb4-49c9-b593-d223f7449a82
Add a missing file for r58323. See WordPress/wordpress-develop#6468. See #61110. Built from https://develop.svn.wordpress.org/trunk@58324 git-svn-id: http://core.svn.wordpress.org/trunk@57781 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Add a missing file for r58323. See WordPress/wordpress-develop#6468. See #61110. Built from https://develop.svn.wordpress.org/trunk@58324 git-svn-id: https://core.svn.wordpress.org/trunk@57781 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Sync ticket for WordPress/gutenberg#61244.
Trac ticket: https://core.trac.wordpress.org/ticket/61110.
This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.