Fix the site editor loading in multi-site installs #49861
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
youknowriad
added
[Type] Bug
youknowriad
force-pushed
the
fix/multi-site-site-editor
branch
from
a46cf5e
to
28c371a
Compare
|
Size Change: +6 B (0%) Total Size: 1.37 MB
ℹ️ View Unchanged
|
|
@youknowriad thanks for spoting this !
|
youknowriad
requested review from
a team,
oandregal and
noahtallen
and removed request for
a team
|
We also need to make sure this doesn't regress #48363. |
|
@Mamaduka yeah, as long as we use the url of the home page and not some "relative url" (like |
|
The testing I've done:
|
oandregal
reviewed
Apr 18, 2023
| homepageId: | ||
| siteData?.show_on_front === 'page' | ||
| ? siteData.page_on_front | ||
| : null, | ||
| url: siteData?.url, |
There was a problem hiding this comment.
Code-wise, this is in line with the other two places I've seen this in use: home-link and header-edit-mode.
There was a problem hiding this comment.
@oandregal, the index endpoint data is defined here - https://github.com/WordPress/wordpress-develop/blob/trunk/src/wp-includes/rest-api/class-wp-rest-server.php#L1255-L1266.
The change correctly uses home instead of the url.
oandregal
approved these changes
Apr 18, 2023
bph
added
the
Backport to Gutenberg RC
mattwiebe
reviewed
Apr 18, 2023
|
Will this fix be included in WP 6.2.1 ? |
7 tasks
Yes, that's the idea, it is labeled as such. |
3 tasks
14 tasks
bph
pushed a commit
that referenced
this pull request
Apr 19, 2023
ndiego
removed
the
Backport to Gutenberg RC
mattwiebe
added a commit
to Automattic/wp-calypso
that referenced
this pull request
Apr 20, 2023
Now that WordPress/gutenberg#49861 has landed on wpcom, we can remove our workaround of adding the query args ourselves.
7 tasks
mattwiebe
added a commit
to Automattic/wp-calypso
that referenced
this pull request
Apr 20, 2023
Now that WordPress/gutenberg#49861 has landed on wpcom, we can remove our workaround of adding the query args ourselves.
Mamaduka
pushed a commit
that referenced
this pull request
May 8, 2023
|
I just cherry-picked this PR to the wp/6.2 branch to get it included in the next release: a3358b2 |
Mamaduka
removed
the
Backport to WP Minor Release
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.
WHAT
In multi-site installs, the site editor shows an infinite loader when accessing it. This PR should fix it.
🤖 Generated by Copilot at a46cf5e
WHY
The url property is not available in the /settings endpoint that we were using initially in multi site installs. This PR uses the index/base endpoint to retrieve the home page url instead.
HOW
🤖 Generated by Copilot at a46cf5e
Testing
I'd appreciate if folks have an easy way to setup a multi-site instance locally to check the fix there.