Commit Graph

44099 Commits

Author SHA1 Message Date
desrosj
b32d8c1bf6 Widgets: Stop loading wp-editor and the Block Directory assets on the widgets screen.
When using the text widget, a `wp.editor.initialize is not a function` notice is encountered. This happens when `wp-editor` is loaded as a dependency, which assigns `wp.oldEditor = wp.editor` and then redefines `wp.editor`.

`wp-editor` is only used for the Classic block, which is not supported in the new widgets editor. [51198-51199] updated `@wordpress/block-library` to remove `wp-editor` as a dependency, but it’s still listed as a dependency of the `wp-block-directory` script handle.

Since the Block directory is not supported within the widgets editor, the related assets can safely be blocked from enqueueing.

Props noisysocks, gziolo, Mamaduka, mkaz.
Fixes #53437. See #53397.
Built from https://develop.svn.wordpress.org/trunk@51202


git-svn-id: http://core.svn.wordpress.org/trunk@50811 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-22 16:56:56 +00:00
ryelle
8a11188d0f Twenty Twenty-One: Add margins around content in Post Template block.
Props desrosj, joen.
See #53389, #53398.


Built from https://develop.svn.wordpress.org/trunk@51201


git-svn-id: http://core.svn.wordpress.org/trunk@50810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-22 16:55:58 +00:00
desrosj
5259b18f50 Widgets: Add editor styles to the widgets block editor.
This updates the widgets screen to load the editor styles in the same way as the post editor. This combined with the package updates in [51198] and [51199] ensures that the blocks added to sidebars more accurately reflect what will be displayed on the front end of the site.

Props isabel_brison, noisysocks, andraganescu, audrasjb, jorbin, caseymilne, desrosj.
Fixes #53344. See #53388.
Built from https://develop.svn.wordpress.org/trunk@51200


git-svn-id: http://core.svn.wordpress.org/trunk@50809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-22 13:33:58 +00:00
jorgefilipecosta
ab25191895 Block Editor: Package updates for Beta 3.
The commit updates the WordPress packages for beta 3.

Props nosolosw, noisysocks, youknowriad.
See #53397.
Built from https://develop.svn.wordpress.org/trunk@51199


git-svn-id: http://core.svn.wordpress.org/trunk@50808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-22 10:00:50 +00:00
jorgefilipecosta
6db7930147 Ports theme.json changes for beta 3.
- Add _wp_to_kebab_case function
- Add CSS Custom Properties within preset classes.

Props nosolosw.
See #53397.
Built from https://develop.svn.wordpress.org/trunk@51198


git-svn-id: http://core.svn.wordpress.org/trunk@50807 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-22 09:51:00 +00:00
Peter Wilson
0d8727bec8 Themes: Improve Gutenberg check before activating an FSE theme.
Account for sites enabling Gutenberg as an mu-plugin when determining whether full-site-editing themes can be enabled. This replaces the check the plugin is active with a check whether the function `gutenberg_is_fse_theme()` is defined.

Follow up to [51193].

Props noisysocks, peterwilsoncc, SergeyBiryukov.
See #53410.


Built from https://develop.svn.wordpress.org/trunk@51197


git-svn-id: http://core.svn.wordpress.org/trunk@50806 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-22 05:56:57 +00:00
Sergey Biryukov
e84cfe850d Tests: Use more appropriate assertions in a few tests.
Follow-up to [34804], [41376], [50959], [51124].

See #52625.
Built from https://develop.svn.wordpress.org/trunk@51196


git-svn-id: http://core.svn.wordpress.org/trunk@50805 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-22 04:35:59 +00:00
antpb
b2c449b1ec Media: Improve upload page media item layout on smaller screens.
This allows smaller screens to wrap error messages and other uploader media item elements in a more readable way.

Props joedolson sabernhardt, Presskopp.
See #51754.


Built from https://develop.svn.wordpress.org/trunk@51195


git-svn-id: http://core.svn.wordpress.org/trunk@50804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-22 04:26:58 +00:00
desrosj
84ee1c9de5 Themes: Remove unexpected border around the Theme Details button.
After [51083], the Theme Details button is now displaying a border unintentionally. This removes it.

Props ryelle.
Fixes #53473.
Built from https://develop.svn.wordpress.org/trunk@51194


git-svn-id: http://core.svn.wordpress.org/trunk@50803 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-22 04:03:57 +00:00
desrosj
94841ace05 Themes: Prevent a Full Site Editing theme from being activated when Gutenberg is not active.
When a theme that uses the Full Site Editing feature is activated and the Gutenberg plugin is not present, the site will currently show a text notice on the front end. The user is not made aware of this unless they visit the front end of their site.

This adds a check that will prevent a theme from being activated when the `full-site-editing` tag is present in the theme’s `style.css` header and the Gutenberg plugin is not active to prevent this scenario.

These checks can be removed once Full Site Editing is completely merged into Core.

Props desrosj, marybaum, chanthaboune.
See #53410.
Built from https://develop.svn.wordpress.org/trunk@51193


git-svn-id: http://core.svn.wordpress.org/trunk@50802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-22 02:59:56 +00:00
desrosj
52e1e2cc2f Twenty Thirteen: Improve the display of the Query Loop block.
This fixes an issue where Query Loop blocks were displayed with list bullets and extra `padding-left`.

Props AlePerez92, scruffian, ryelle.
Fixes #53438.
Built from https://develop.svn.wordpress.org/trunk@51192


git-svn-id: http://core.svn.wordpress.org/trunk@50801 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-21 23:39:56 +00:00
joedolson
d5c9c310e7 Media: Update total attachment count when media added or removed.
Add handlers to increment the total attachments count for the media collection when an item is added or removed.

props adamsilverstein.
Fixes #53171.
Built from https://develop.svn.wordpress.org/trunk@51191


git-svn-id: http://core.svn.wordpress.org/trunk@50800 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-21 20:46:02 +00:00
Sergey Biryukov
dc51282844 Users: Escape get_author_posts_url() link in wp_list_authors().
This is consistent with `get_the_author_posts_link()`.

Props chintan1896.
Fixes #50698.
Built from https://develop.svn.wordpress.org/trunk@51190


git-svn-id: http://core.svn.wordpress.org/trunk@50799 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-21 06:06:57 +00:00
Sergey Biryukov
19f8ac491d Administration: Consistently escape network_admin_url() links.
Follow-up to [51177].

Props chintan1896, mukesh27.
Fixes #53459.
Built from https://develop.svn.wordpress.org/trunk@51189


git-svn-id: http://core.svn.wordpress.org/trunk@50798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-21 04:30:56 +00:00
Sergey Biryukov
ca5f990078 Docs: Correct @since version in the wp-includes/version.php file header.
There was no public release of WordPress 1.1.

Follow-up to [803], [43662].

See #52628.
Built from https://develop.svn.wordpress.org/trunk@51188


git-svn-id: http://core.svn.wordpress.org/trunk@50797 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-21 04:29:56 +00:00
joedolson
daa1cbbbfe Media: Adapt response shape depending on type of query.
Restore inheriting the backbone fetch in the media library and adapt the AJAX response according to the action performed in the media query.

In [51145], the response shape was restored to the original shape, and a custom fetch was added to handle assigning the totalAttachments information in the collection. The custom fetch triggered a new set of bugs relating to zero-sized collections and loading individual images. 

props adamsilverstein, ryelle, peterwilsoncc, Presskopp, desrosj.
Fixes #53421, #53419.
Built from https://develop.svn.wordpress.org/trunk@51187


git-svn-id: http://core.svn.wordpress.org/trunk@50796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-20 23:27:01 +00:00
Sergey Biryukov
21bb743811 Tests: Use more appropriate assertions in clean_dirsize_cache() tests.
Follow-up to [49212], [49616], [49628], [49630].

See #52625.
Built from https://develop.svn.wordpress.org/trunk@51186


git-svn-id: http://core.svn.wordpress.org/trunk@50795 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-20 00:25:59 +00:00
Sergey Biryukov
0e5a98eec5 Docs: Correct DocBlock formatting for Core_Upgrader::upgrade().
Document the `$auto_update_settings` parameter of the `after_core_auto_updates_settings` action.

Follow-up to [49254].

See #52628.
Built from https://develop.svn.wordpress.org/trunk@51185


git-svn-id: http://core.svn.wordpress.org/trunk@50794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-19 21:37:57 +00:00
Sergey Biryukov
6c01c2a864 Docs: Add a reference to WP_Site_Query::__construct() for information on accepted arguments in get_sites().
Synchronize the documentation between two places, use `WP_Site_Query::__construct()` as the canonical source.

Follow-up to [37616].

Props birgire, felipeelia, audrasjb.
Fixes #42156.
Built from https://develop.svn.wordpress.org/trunk@51184


git-svn-id: http://core.svn.wordpress.org/trunk@50793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-19 20:57:01 +00:00
Sergey Biryukov
5f30098a1d REST API: Decode single and double quote entities in widget names and descriptions.
Follow-up to [51174], [51175].

Props ocean90, ramonopoly.
Fixes #53407.
Built from https://develop.svn.wordpress.org/trunk@51183


git-svn-id: http://core.svn.wordpress.org/trunk@50792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-18 15:52:56 +00:00
Sergey Biryukov
e127bcde70 Themes: Make sure get_file_data() recognizes headers prefixed by <?php tag.
This allows for using headers in the format of `<?php // Template Name: Something ?>`, which previously could not be recognized correctly.

Props dd32, m_uysl, thomas-vitale, boblinthorst.
Fixes #33387.
Built from https://develop.svn.wordpress.org/trunk@51182


git-svn-id: http://core.svn.wordpress.org/trunk@50791 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-18 14:03:58 +00:00
Sergey Biryukov
87c740b086 Tests: Correct svn:eol-style property for test data with CR line endings.
Follow-up to [703/tests], [704/tests], [46586].

See #52625.
Built from https://develop.svn.wordpress.org/trunk@51181


git-svn-id: http://core.svn.wordpress.org/trunk@50790 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-18 13:58:58 +00:00
Sergey Biryukov
4ccc58801d Upgrade/Install: Deactivate the Gutenberg plugin if its version is 10.7 or lower.
This avoids a fatal error due to `WP_Block_Template` class redeclaration when updating to WordPress 5.8 with an older version of Gutenberg activated.

Follow-up to [35582] for the REST API plugin.

Props hellofromTonya, oglekler, azaozz, desrosj, pbiron, jorbin, youknowriad, TimothyBlynJacobs, Clorith, markparnell.
See #53432.
Built from https://develop.svn.wordpress.org/trunk@51180


git-svn-id: http://core.svn.wordpress.org/trunk@50789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-18 12:14:01 +00:00
desrosj
7369505689 Build/Test Tools: Use Git when fetching the WordPress Importer for use in tests.
This switches to using Git in the local Docker environment install script to check out a copy of the WordPress Importer plugin for use in unit tests.

Previously, SVN was used and the commands were not correctly run within the Docker container. The container does not actually have SVN installed, and the script was only working when the machine running the command had SVN present.

Props czapla, alexstine, jnylen0, francina, desrosj.
Fixes #52909.
Built from https://develop.svn.wordpress.org/trunk@51179


git-svn-id: http://core.svn.wordpress.org/trunk@50788 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-17 17:58:57 +00:00
Sergey Biryukov
7d3b5dfb17 Coding Standards: Bring some consistency to HTML formatting in wp-admin/comment.php.
See #52627.
Built from https://develop.svn.wordpress.org/trunk@51178


git-svn-id: http://core.svn.wordpress.org/trunk@50787 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-17 14:49:58 +00:00
Sergey Biryukov
6a163e199a Administration: Consistently escape admin_url() links.
Props chintan1896, mukesh27.
Fixes #53426.
Built from https://develop.svn.wordpress.org/trunk@51177


git-svn-id: http://core.svn.wordpress.org/trunk@50786 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-17 14:37:00 +00:00
Sergey Biryukov
1a5a8c23b8 Editor: Include Cover block in the list of block types registered using metadata files.
This ensures that block stylesheets are rendered properly when `should_load_separate_core_block_assets` filter is turned on.

Follow-up to [50824], [50836].

Props walbo.
Fixes #53440.
Built from https://develop.svn.wordpress.org/trunk@51176


git-svn-id: http://core.svn.wordpress.org/trunk@50785 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-17 11:57:56 +00:00
Sergey Biryukov
29ba355256 Coding Standards: Fix WPCS issue in [51174].
See #53407.
Built from https://develop.svn.wordpress.org/trunk@51175


git-svn-id: http://core.svn.wordpress.org/trunk@50784 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-17 11:33:58 +00:00
Sergey Biryukov
9f1145b8ae REST API: Decode HTML entities in widget names and descriptions in widget types controller.
Follow-up to [50995].

Props ramonopoly, noisysocks, spacedmonkey, justinahinon, audrasjb, SergeyBiryukov.
Fixes #53407.
Built from https://develop.svn.wordpress.org/trunk@51174


git-svn-id: http://core.svn.wordpress.org/trunk@50783 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-17 11:30:00 +00:00
desrosj
fcd47d289e Build/Test Tools: Ignore sourceMaps for non WordPress Core files.
If a custom plugin or theme exists in the `build/wp-content` directory with a sourcemap, the build` script is currently returning a warning and failing.

This improves the `verify:source-maps` task in Grunt to ignore directories and files that do not belong to WordPress Core.

Props ryelle, afragen, johnbillion.
Fixes #52689.
Built from https://develop.svn.wordpress.org/trunk@51173


git-svn-id: http://core.svn.wordpress.org/trunk@50782 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-16 22:57:59 +00:00
Sergey Biryukov
f6bff0572f Tests: Make some optional parameters required in unit tests for previous/next attachment links.
This resolves a "Deprecated: Required parameter follows optional parameter" notice on PHP 8.

Follow-up to [48794], [51122].

See #45708, #52625.
Built from https://develop.svn.wordpress.org/trunk@51172


git-svn-id: http://core.svn.wordpress.org/trunk@50781 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-16 17:31:59 +00:00
Sergey Biryukov
07737d2d8d External Libraries: Upgrade PHPMailer to version 6.5.0.
Release notes: https://github.com/PHPMailer/PHPMailer/releases/tag/v6.5.0

For a full list of changes in this update, see the PHPMailer GitHub:
https://github.com/PHPMailer/PHPMailer/compare/v6.4.1...v6.5.0

Props ayeshrajans, Synchro.
Fixes #53430.
Built from https://develop.svn.wordpress.org/trunk@51169


git-svn-id: http://core.svn.wordpress.org/trunk@50778 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-16 17:02:59 +00:00
Sergey Biryukov
b27fbee0f3 Docs: Update syntax for some multi-line comments per the documentation standards.
Follow-up to [51003], [51149].

See #52628.
Built from https://develop.svn.wordpress.org/trunk@51168


git-svn-id: http://core.svn.wordpress.org/trunk@50777 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-16 09:42:56 +00:00
Sergey Biryukov
5ffd5d6e9b Editor: Check if supports metadata key is defined before migrating typography keys.
This avoids an "Undefined index" PHP notice on blocks without a `supports` key in `block.json`.

Follow-up to [51089], [51153], [51159]. 

Props walbo.
Fixes #53416.
Built from https://develop.svn.wordpress.org/trunk@51167


git-svn-id: http://core.svn.wordpress.org/trunk@50776 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 21:37:58 +00:00
Sergey Biryukov
d32aa67e80 Docs: Update syntax for multi-line comment in wp_generate_attachment_metadata() per the documentation standards.
Follow-up to [23766], [25968], [35554], [51162].

Props hellofromTonya.
Fixes #52603.
Built from https://develop.svn.wordpress.org/trunk@51166


git-svn-id: http://core.svn.wordpress.org/trunk@50775 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 19:10:58 +00:00
desrosj
282a246085 Post WordPress 5.8 Beta 2 version bump.
Built from https://develop.svn.wordpress.org/trunk@51165


git-svn-id: http://core.svn.wordpress.org/trunk@50774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 18:05:58 +00:00
desrosj
5ff9de5830 WordPress 5.8 Beta 2.
Built from https://develop.svn.wordpress.org/trunk@51164


git-svn-id: http://core.svn.wordpress.org/trunk@50773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 17:40:57 +00:00
Sergey Biryukov
8bb6b05d78 Quick/Bulk Edit: Ensure that $post_ids variable is initialized ahead of usage.
This brings some consistency between similar fragments of `wp-admin/edit.php` and `wp-admin/upload.php`.

Follow-up to [51111], [51161].

See #39589, #53411.
Built from https://develop.svn.wordpress.org/trunk@51163


git-svn-id: http://core.svn.wordpress.org/trunk@50772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 17:04:56 +00:00
Sergey Biryukov
4803207ba1 Media: Make sure wp_generate_attachment_metadata() always returns an array.
This matches the documentation for the filter of the same name.

Previously, the function could return `false` for an audio or video attachment that does not exist in the local filesystem.

Props Chouby, SergeyBiryukov.
Fixes #52603.
Built from https://develop.svn.wordpress.org/trunk@51162


git-svn-id: http://core.svn.wordpress.org/trunk@50771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 16:52:56 +00:00
davidbaumwald
870a494015 Media: Ensure $post_ids is evaluated properly when processing bulk actions.
After [51111], the `$post_ids` variable is now initialized as an empty array when processing a bulk action.  As such, the original check using `isset` on `$post_ids` will always evaluate to `true`.  This change swaps the `isset` checks for `empty` to check array length instead.

Props david.binda, hellofromTonya.
Fixes #53411.
Built from https://develop.svn.wordpress.org/trunk@51161


git-svn-id: http://core.svn.wordpress.org/trunk@50770 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 16:51:59 +00:00
Sergey Biryukov
84d822fc46 I18N: Remove redundant default text domain parameter in some __() calls.
Follow-up to [43919], [44262], [48141], [50259].

See #52627.
Built from https://develop.svn.wordpress.org/trunk@51160


git-svn-id: http://core.svn.wordpress.org/trunk@50769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 16:16:57 +00:00
Sergey Biryukov
200a5058e0 Docs: Add missing documentation for wp_migrate_old_typography_shape().
Follow-up to [51089].

See #52991, #52628.
Built from https://develop.svn.wordpress.org/trunk@51159


git-svn-id: http://core.svn.wordpress.org/trunk@50768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 16:04:58 +00:00
Sergey Biryukov
0def70a94c Coding Standards: Use consistent formatting for _wp_posts_page_notice() and _wp_block_editor_posts_page_notice().
Remove redundant casting to `int` for post ID, which is always an integer.

Follow-up to [51116].

See #45537, #52627.
Built from https://develop.svn.wordpress.org/trunk@51158


git-svn-id: http://core.svn.wordpress.org/trunk@50767 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 15:50:58 +00:00
Sergey Biryukov
4811dad603 I18N: Use consistent pattern for placeholder references in translator comments for some bundled theme strings.
Follow-up to [42827], [44562], [50234].

See #52628.
Built from https://develop.svn.wordpress.org/trunk@51157


git-svn-id: http://core.svn.wordpress.org/trunk@50766 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 15:38:57 +00:00
youknowriad
b018c55899 Block Editor: Second batch of fixes for 5.8 beta 2
This includes:

 - Fix regression emptying post content block in template mode.
 - Legacy Widget: Don't display "No preview" when widget has image tags.

See #53397. 

Built from https://develop.svn.wordpress.org/trunk@51156


git-svn-id: http://core.svn.wordpress.org/trunk@50765 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 15:30:24 +00:00
Sergey Biryukov
aed608b98c Coding Standards: Remove a one-time $message variable in WordPress version requirement notices for bundled themes.
This makes the formatting of these messages more consistent.

Follow-up to [23816], [51154].

See #52627.
Built from https://develop.svn.wordpress.org/trunk@51155


git-svn-id: http://core.svn.wordpress.org/trunk@50764 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 15:24:58 +00:00
Sergey Biryukov
e05ffb46a5 Coding Standards: Remove a one-time $message variable in some _doing_it_wrong() calls.
This brings some consistency with most other calls.

Follow-up to [23378], [25605], [34745], [36219], [44108], [46111], [48156].

See #52627.
Built from https://develop.svn.wordpress.org/trunk@51154


git-svn-id: http://core.svn.wordpress.org/trunk@50763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 15:22:58 +00:00
Sergey Biryukov
4d3ddd056f Editor, I18N: Remove code from a translatable string in wp_migrate_old_typography_shape().
Replace a `trigger_error()` call with `_doing_it_wrong()` for consistency with how similar messages are displayed elsewhere in core.

Follow-up to [51089].

See #52991.
Built from https://develop.svn.wordpress.org/trunk@51153


git-svn-id: http://core.svn.wordpress.org/trunk@50762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 14:02:59 +00:00
Sergey Biryukov
408db6120e Docs: Document the VALID_ORIGINS constant in WP_Theme_JSON.
Follow-up to [51149].

See #52628.
Built from https://develop.svn.wordpress.org/trunk@51152


git-svn-id: http://core.svn.wordpress.org/trunk@50761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 11:25:08 +00:00
Sergey Biryukov
6276e68c6c Docs: Document the usage of $wp_embed global in WP_oEmbed_Controller::get_proxy_item().
Follow-up to [48135].

Fixes #52628.
Built from https://develop.svn.wordpress.org/trunk@51151


git-svn-id: http://core.svn.wordpress.org/trunk@50760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-06-15 10:24:57 +00:00