Edit Site: Fix Template Part Auto-draft creation#23050
Merged
Conversation
7 tasks
|
Size Change: 0 B Total Size: 1.13 MB ℹ️ View Unchanged
|
oandregal
approved these changes
Jun 10, 2020
Contributor
Author
|
Restarting the failing Travis CI job. |
Contributor
Author
|
Still failing. It's the Build Artifacts job, I'll investigate. |
Member
|
@ockham there's a convo in core-editor as well https://wordpress.slack.com/archives/C02QB2JS7/p1591791354355800 |
carolinan
approved these changes
Jun 10, 2020
Contributor
carolinan
left a comment
There was a problem hiding this comment.
All template parts are showing (and saving) correctly for the 3 themes I tested.
Contributor
Author
|
Filed #23052 to hopefully fix the issue with the Build Artifacts job 🤞 |
oandregal
pushed a commit
that referenced
this pull request
Jun 10, 2020
oandregal
pushed a commit
that referenced
this pull request
Jun 10, 2020
- Edit Site: fix template lookup. #22954 - Fix for FSE template parts: #23050 - Fix link color style rule. #23025 - Fix for link color: it needs to be opt-in. #23049 - Revert "Image Block: add caption field to placeholder" #23027 - Cover padding: reset button + hook namespace + improve visualizer #23041 - Fix failing 'Build artifacts' CI job (by updating `package-lock.json`): #23052
epiqueras
reviewed
Jun 10, 2020
Contributor
epiqueras
left a comment
There was a problem hiding this comment.
Thanks for the quick fix!
| if ( 'core/template-part' !== $block['blockName'] ) { | ||
| return array(); | ||
| } | ||
| $template_part_ids = array(); |
Contributor
There was a problem hiding this comment.
This doesn't need to be an array.
Contributor
Author
There was a problem hiding this comment.
What's the alternative? 🤔 It seemed like the most straight-forward way to allow for the inner blocks recursion to conditionally extend it.
Contributor
There was a problem hiding this comment.
I think I just expected it to be added to the array at the end instead of declaring itself as an array, but I can see how that can be more complicated in PHP.
12 tasks
This was referenced Jun 24, 2020
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Description
This fixes an issue introduced by yours truly in #22143, and first reported by @carolinan in Slack:
The problem was that we were bailing early from
create_auto_draft_for_template_part_blockif the block type was notcore/template-part. But this means that we also didn't descend into recursion of a block's inner blocks, and neglected e.g. the template part block children of agroupblock.This probably went unnoticed for a while because many of us still had some auto-generated template part auto-drafts lingering from previous runs of the site editor.
Diff best viewed with whitespace changes ignored.
Thanks @carolinan for reporting, and @nosolosw for bringing this to my attention!
How has this been tested?
wp_templateCPTs (neither published norauto-drafts) from previous Site Editor runs. (It's best to start with a fresh install, i.e.npx wp-env clean all && npx wp-env start. Careful, this will wipe your WordPress install's data!)/wp-admin/admin.php?page=gutenberg-experimentsmust not be ticked. (Make sure the "Full Site Editing" checkbox is ticked -- since it also gets reset after a wipe.)theme-experimentsrepo (see thewp-envREADME).Screenshots
Before
After
Types of changes
Bug fix
Checklist: