Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-19 17:15:16 +01:00
Code Issues Projects Releases Wiki Activity
41,723 Commits 50 Branches 748 Tags 792 MiB
89242ed8e5
Commit Graph

41723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ianbelanger
bc0e05d6c8 Bundled Themes: Twenty Twenty inconsistent top and bottom margins for .alignwide and .alignfull on Chrome vs Safari. 
Fixes the inconsistent margins for `alignwide` and `alignfull` classes used on Cover Block when it is the first block on a page.

Props kthmd, utz119, nikhilbhansi.
Fixes #49435.
Built from https://develop.svn.wordpress.org/trunk@47820


git-svn-id: http://core.svn.wordpress.org/trunk@47596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-18 19:52:07 +00:00
Sergey Biryukov
307725883a Themes: Prevent installation of themes that require a higher version of PHP or WordPress. 
Props afragen.
Fixes #49653. See #48491.
Built from https://develop.svn.wordpress.org/trunk@47819


git-svn-id: http://core.svn.wordpress.org/trunk@47595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-18 16:03:09 +00:00
Sergey Biryukov
54cdfaef59 Themes: Remove extra whitespace from wp-admin/includes/ajax-actions.php and wp-admin/includes/theme.php. 
Follow-up to [47816].

See #48491.
Built from https://develop.svn.wordpress.org/trunk@47818


git-svn-id: http://core.svn.wordpress.org/trunk@47594 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-18 12:55:06 +00:00
Sergey Biryukov
e445642243 Themes: Remove debug call from wp-admin/theme-install.php. 
Follow-up to [47816].

See #48491.
Built from https://develop.svn.wordpress.org/trunk@47817


git-svn-id: http://core.svn.wordpress.org/trunk@47593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-18 12:49:08 +00:00
Sergey Biryukov
b73bbd8139 Themes: Prevent activation and live preview of themes that require a higher version of PHP or WordPress. 
Props afragen, jorbin, TimothyBlynJacobs, SergeyBiryukov.
See #48491.
Built from https://develop.svn.wordpress.org/trunk@47816


git-svn-id: http://core.svn.wordpress.org/trunk@47592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-18 12:32:10 +00:00
Sergey Biryukov
d528d7a044 Site Health: Use WP_Theme::parent() in the inactive themes test as a more reliable check that the parent theme exists. 
This is also more consistent with the other instances of directly referencing `WP_Theme::parent()` properties or methods in core.

Props mukesh27, juanlopez4691, davidbaumwald, afragen, SergeyBiryukov.
Fixes #49934.
Built from https://develop.svn.wordpress.org/trunk@47815


git-svn-id: http://core.svn.wordpress.org/trunk@47591 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-18 04:38:10 +00:00
Sergey Biryukov
91936df3d1 Coding Standards: Fix WPCS issues in plugin and theme upgrader classes. 
See #49542.
Built from https://develop.svn.wordpress.org/trunk@47814


git-svn-id: http://core.svn.wordpress.org/trunk@47590 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-17 09:39:11 +00:00
Sergey Biryukov
f9b60d3334 Accessibility: Login and Registration: Respect the prefers-reduced-motion media query for "shake" CSS animation on login failure. 
This shake should not occur when the user has opted to reduce motion, for example by selecting the "Reduce motion" option in macOS' preferences or unselecting "Show animations in Windows" in Windows' preferences.

Follow-up to [47226].

Props eddystile, johnbillion, sabernhardt, afercia, audrasjb.
Fixes #49723.
Built from https://develop.svn.wordpress.org/trunk@47813


git-svn-id: http://core.svn.wordpress.org/trunk@47589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-16 20:25:19 +00:00
TimothyBlynJacobs
cf0bfa3856 Coding Standards: Correct docblock indentation. 
Fixes PHPCS failure introduced in r47811.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47588 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-16 19:56:09 +00:00
TimothyBlynJacobs
1e524e7322 REST API: Add @since entries for rest_validate_value_from_schema(). 
See #49572, #48818, #44949, #50053, #48820, #49720, #42961, #44975, #43392, #38583.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47587 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-16 19:33:09 +00:00
TimothyBlynJacobs
fe00d7f7bf REST API: Support the JSON Schema pattern keyword. 
Props jason_the_adams, birgire, sorenbronsted.
Fixes #44949.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47586 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-16 19:03:08 +00:00
TimothyBlynJacobs
26bda18a23 REST API: Check required properties are provided when validating an object. 
Previously, the WP_REST_Request object validated that top-level properties were defined, but this did not extend to those object's required properties. This adds validation to rest_validate_value_from_schema() directly.

Both the v3 and v4 JSON Schema syntax for required properties is supported.

Props sorenbronsted.
Fixes #48818.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47585 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-16 18:44:09 +00:00
Sergey Biryukov
7932193708 Coding Standards: Use strict comparison where static strings are involved. 
This reduces the number of `WordPress.PHP.StrictComparisons.LooseComparison` issues in half, from 1897 to 890.

Includes minor code layout fixes for better readability.

See #49542.
Built from https://develop.svn.wordpress.org/trunk@47808


git-svn-id: http://core.svn.wordpress.org/trunk@47584 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-16 18:42:12 +00:00
Sergey Biryukov
45f7e68d54 Media: Expose media grid frame via wp-media-grid-ready trigger for easier customization. 
Props soulseekah.
Fixes #50185.
Built from https://develop.svn.wordpress.org/trunk@47807


git-svn-id: http://core.svn.wordpress.org/trunk@47583 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-16 17:25:11 +00:00
Sergey Biryukov
16a8128765 Coding Standards: Fix WPCS issues in wp-admin/includes/class-wp-screen.php. 
See #49542.
Built from https://develop.svn.wordpress.org/trunk@47802


git-svn-id: http://core.svn.wordpress.org/trunk@47578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-15 18:13:09 +00:00
ianbelanger
e54d8406eb Bundled Themes: Twenty Eleven & Twenty Twelve dropdown category widget exceeds parent div when strings are long enough. 
Fixes the width of the category dropdown by limiting the width of `select` items in widgets using `max-width: 100%`.

Props gma992, karmatosed.
Fixes #37926.
Built from https://develop.svn.wordpress.org/trunk@47801


git-svn-id: http://core.svn.wordpress.org/trunk@47577 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-15 16:31:11 +00:00
ianbelanger
b10bd5134c Bundled Themes: Twenty Twenty version bump. 
We are releasing a new version of Twenty Twenty today thus we need to bump the version.

Props ianbelanger.
Fixes #50174.
Built from https://develop.svn.wordpress.org/trunk@47800


git-svn-id: http://core.svn.wordpress.org/trunk@47576 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-14 18:12:07 +00:00
ianbelanger
86b20d5655 Bundled Themes: Twenty Twenty custom post types that don't support authors, shows author box. 
This fixes the issue where custom post types will show an author box, even if they don't support authors.

Props joyously, donmhico.
Fixes #48803.
Built from https://develop.svn.wordpress.org/trunk@47799


git-svn-id: http://core.svn.wordpress.org/trunk@47575 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-14 17:17:07 +00:00
Sergey Biryukov
618329a750 Docs: Update Michael Heilemann's URL in a comment in wp-includes/theme-compat/footer.php. 
Props ritterml, mukesh27.
Fixes #50171.
Built from https://develop.svn.wordpress.org/trunk@47798


git-svn-id: http://core.svn.wordpress.org/trunk@47574 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-14 15:33:08 +00:00
Sergey Biryukov
69adb593a2 Themes: Add "Block Editor Patterns" and "Full Site Editing" to the list of WordPress theme features. 
Follow-up to [meta9876].

Props dingo_d.
Fixes #50164. See #meta5212.
Built from https://develop.svn.wordpress.org/trunk@47797


git-svn-id: http://core.svn.wordpress.org/trunk@47573 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-14 14:43:08 +00:00
ianbelanger
ceed19f625 Bundled Themes: Twenty Twenty add GPLv2 compatible TikTok icon to the social icon menu. 
This adds a GPLv2 compatible TikTok icon to replace the non-compatible TikTok icon and update the readme.txt file. Updates previous commit which used a non-compatible TikTok icon [47589]

Props poena, audrasjb, Emlebrun.
Fixes #49893.
Built from https://develop.svn.wordpress.org/trunk@47796


git-svn-id: http://core.svn.wordpress.org/trunk@47572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-14 13:48:11 +00:00
ianbelanger
f7539586be Bundled Themes: Twenty Twenty add icon for g.page links. 
Adds the option to use a g.page url for the social menu.

Props argentite, mayankmajeji.
Fixes #49088.
Built from https://develop.svn.wordpress.org/trunk@47795


git-svn-id: http://core.svn.wordpress.org/trunk@47571 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-14 13:05:09 +00:00
Sergey Biryukov
fb0e6531ab Docs: Add @since notes for theme features added or removed in get_theme_feature_list() after its introduction in WordPress 3.1. 
See #50165.
Built from https://develop.svn.wordpress.org/trunk@47794


git-svn-id: http://core.svn.wordpress.org/trunk@47570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-14 12:50:08 +00:00
Sergey Biryukov
04e3fd6995 Themes: Add "Block Editor Styles" and "Wide Blocks" to the list of WordPress theme features. 
These were added to Theme Directory API in anticipation of being committed to core for WordPress 5.2+, which has not happened until now.

Follow-up to [meta8273].

See #46272.
Built from https://develop.svn.wordpress.org/trunk@47790


git-svn-id: http://core.svn.wordpress.org/trunk@47566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-14 09:18:08 +00:00
Sergey Biryukov
5e42a6c9e5 Export: Use correct escaping function for term IDs in <wp:term> nodes. 
Follow-up to [34333].

Props DrLightman, marcio-zebedeu.
Fixes #50113.
Built from https://develop.svn.wordpress.org/trunk@47789


git-svn-id: http://core.svn.wordpress.org/trunk@47565 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-14 07:55:12 +00:00
Sergey Biryukov
9e343ccb33 Coding Standards: Use strict comparison in wp-admin/upgrade.php. 
Props mukesh27.
Fixes #50155.
Built from https://develop.svn.wordpress.org/trunk@47788


git-svn-id: http://core.svn.wordpress.org/trunk@47564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-13 10:10:08 +00:00
Sergey Biryukov
1e813b0275 Coding Standards: Correct db_version check in wp-admin/admin.php. 
Follow-up to [47785].

See #49239.
Built from https://develop.svn.wordpress.org/trunk@47787


git-svn-id: http://core.svn.wordpress.org/trunk@47563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-12 20:59:08 +00:00
Sergey Biryukov
bfba3fc458 Docs: Improve documentation for functions in wp-admin/install-helper.php per the documentation standards. 
Synchronize descriptions with the functions' counterparts from `wp-admin/includes/upgrade.php`.

See #49572.
Built from https://develop.svn.wordpress.org/trunk@47786


git-svn-id: http://core.svn.wordpress.org/trunk@47562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-12 18:40:07 +00:00
Sergey Biryukov
aa69c25d5f Coding Standards: Use strict comparison in some wp-admin files. 
Props pikamander2, mukesh27, SergeyBiryukov.
Fixes #49239.
Built from https://develop.svn.wordpress.org/trunk@47785


git-svn-id: http://core.svn.wordpress.org/trunk@47561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-12 18:32:08 +00:00
ianbelanger
2eef7ee2ac Bundled Themes: Twenty Twenty anchor links don't work in mobile menu. 
Modifies the mobile modal menu javascript, so that anchor links will close the modal and scroll to the anchor within the page.

Props Giorgio25b, suzylah, yuhin, samful, bdcstr.
Fixes #48916.
Built from https://develop.svn.wordpress.org/trunk@47784


git-svn-id: http://core.svn.wordpress.org/trunk@47560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-12 16:45:11 +00:00
Sergey Biryukov
2517abb4bd Docs: Add a note that the $protocols parameter of esc_url_raw() defaults to return value of wp_allowed_protocols(). 
This complements already existing note in `esc_url()`.

Props audrasjb.
Fixes #50147.
Built from https://develop.svn.wordpress.org/trunk@47783


git-svn-id: http://core.svn.wordpress.org/trunk@47559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-11 20:34:13 +00:00
Sergey Biryukov
3fc1b33d53 Docs: Use 3-digit, x.x.x style semantic versioning for inline comments in populate_options(). 
See #49572.
Built from https://develop.svn.wordpress.org/trunk@47782


git-svn-id: http://core.svn.wordpress.org/trunk@47558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-11 17:26:08 +00:00
Sergey Biryukov
7f60aee75a Tests: Give canonical test fixtures for paginated content more descriptive names. 
Follow-up to [47727].

See #28081, #40773, #45337.
Built from https://develop.svn.wordpress.org/trunk@47781


git-svn-id: http://core.svn.wordpress.org/trunk@47557 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-10 20:31:08 +00:00
Sergey Biryukov
ddd3647d7d Coding Standards: Rename some files and classes in phpunit/tests/functions/ per the naming conventions. 
https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#naming-and-organization

See #49542.
Built from https://develop.svn.wordpress.org/trunk@47780


git-svn-id: http://core.svn.wordpress.org/trunk@47556 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-10 12:09:10 +00:00
Peter Wilson
1c4513e5c3 Tests: Add unit tests for _cleanup_header_comment(). 
Props pbearne.
Fixes #38101. See #8497.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-10 05:23:11 +00:00
Sergey Biryukov
0c3117a80f Coding Standards: Fix WPCS issues in wp-includes/update.php. 
Props mukesh27.
Fixes #50130.
Built from https://develop.svn.wordpress.org/trunk@47778


git-svn-id: http://core.svn.wordpress.org/trunk@47554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-09 12:52:10 +00:00
Sergey Biryukov
5511b43e2c Administration: Avoid a PHP 7.4 notice in add_meta_box() when attempting to re-add a previously removed box. 
The logic for skipping previously removed meta boxes with the `core` priority should also apply to the `sorted` priority that is used when the boxes were manually reordered.

Add a unit test.

Props coolmann, franzarmas, SergeyBiryukov.
Fixes #50019.
Built from https://develop.svn.wordpress.org/trunk@47777


git-svn-id: http://core.svn.wordpress.org/trunk@47553 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-09 12:26:12 +00:00
ianbelanger
928ce10da0 Bundled Themes: Twenty Twenty customizer retina_logo should be hidden when no logo is set. 
Modifies the Customize setting `Site Identity > Retina logo` so that the option is hidden if there is no logo is set in `Site Identity > Logo`.

Props truongwp.
Fixes #50109.
Built from https://develop.svn.wordpress.org/trunk@47776


git-svn-id: http://core.svn.wordpress.org/trunk@47552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-08 19:36:10 +00:00
Sergey Biryukov
1cde7d86f9 Coding Standards: Fix WPCS issues in wp-admin/includes/template.php. 
See #49542.
Built from https://develop.svn.wordpress.org/trunk@47775


git-svn-id: http://core.svn.wordpress.org/trunk@47551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-08 16:36:18 +00:00
Sergey Biryukov
43a6aff0d4 Coding Standards: Use strict comparison in wp-includes/widgets/class-wp-widget-rss.php. 
Props mukesh27.
Fixes #50125.
Built from https://develop.svn.wordpress.org/trunk@47774


git-svn-id: http://core.svn.wordpress.org/trunk@47550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-08 08:36:18 +00:00
Sergey Biryukov
33194d29c2 Site Health: Improve the appearance of administration email verification box. 
Add `max-width` on desktop view and some padding on smaller screens.

Props chetan200891, azaozz, Clorith, afragen.
Fixes #48607.
Built from https://develop.svn.wordpress.org/trunk@47772


git-svn-id: http://core.svn.wordpress.org/trunk@47548 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-07 21:42:11 +00:00
Dominik Schilling
7ded6c2d2a Administration: Remove any CSS related to Internet Explorer versions 6 – 10. 
In WordPress 3.2 support for IE6 was dropped, IE7 followed a few versions later. With the 4.8 release, WordPress officially ended support for Internet Explorer versions 8, 9, and 10. Yet, we still have shipped CSS for the unsupported IE versions....until now! Goodbye to ie.css and star hacks!

* Removes ie.css and `ie` style handle.
* Removes IE specific class names and any related CSS.
* Drops support for IE8 and older in `wp_customize_support_script()`.
* Updates compatibility mode for CSS minification to `ie11`.

Props ayeshrajans, isabel_brison, afercia, netweb, peterwilsoncc, ocean90.
Fixes #17232, #46015.
Built from https://develop.svn.wordpress.org/trunk@47771


git-svn-id: http://core.svn.wordpress.org/trunk@47547 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-06 20:15:07 +00:00
Sergey Biryukov
a0224a579d Menus: Add a Cancel link to the screen for creating a new menu. 
The use case this helps the most is when there's only one menu and you click "create a new menu". In this case the Cancel link allows you to go back to the single existing menu.

Props garrett-eclipse, audrasjb.
Fixes #46367.
Built from https://develop.svn.wordpress.org/trunk@47770


git-svn-id: http://core.svn.wordpress.org/trunk@47546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-06 19:35:11 +00:00
Sergey Biryukov
bf3296a9a0 Script Loader: Add the $group parameter to WP_Dependencies::do_item(). 
Previously, the method was called with two parameters in `::do_items()`, while the method signature only included one parameter.

Technically, this was not an issue as `WP_Dependencies::do_item()` is a placeholder meant to be overwritten when extending the class. When handling scripts, `WP_Dependencies` is extended with `WP_Scripts`, and the `$group` parameter was only used in `WP_Scripts::do_item()`, which does expect a second argument.

However, officially adding the parameter to `WP_Dependencies::do_item()` signature prevents code misunderstanding and avoids a warning in PHP code inspection tools.

Props kaggdesign, soulseekah, azaozz, SergeyBiryukov.
Fixes #43627.
Built from https://develop.svn.wordpress.org/trunk@47769


git-svn-id: http://core.svn.wordpress.org/trunk@47545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-06 16:27:12 +00:00
Sergey Biryukov
86ac5e1432 Site Health: Do not trigger the fatal error handler while updates are being installed. 
Triggering the error handler during updates may cause false positives. For example, updates may temporarily "fail" while files are moved around, but work fine once completed. Sending emails about temporary failures would just be confusing to the recipient.

Props Clorith, airamerica.
Fixes #48964.
Built from https://develop.svn.wordpress.org/trunk@47768


git-svn-id: http://core.svn.wordpress.org/trunk@47544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-06 14:38:17 +00:00
whyisjake
538e9fb308 Block Editor: Update _all_ of the block editor packages following the 5.4.1 release. 
This is an extension of [47619] and [47765].

Fixes #50094.
Props aduth, peterwilsoncc, whyisjake, ocean90, and afercia.


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


git-svn-id: http://core.svn.wordpress.org/trunk@47542 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-05 23:56:33 +00:00
whyisjake
4a11b9db02 Block Editor: Update WordPress Packages following the 5.4.1 release. 
This bumps @wordpress/block-library 2.14.7 ➡️ 2.14.8

Fixes #50094.
Props aduth, peterwilsoncc, whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@47541 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-05 23:39:31 +00:00
whyisjake
62f6909480 Code standards: Drop a newline in the customizer to comply with WordPress Coding Standards 
Extends [47763] and #46829.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-05 22:00:09 +00:00
whyisjake
7a48040e13 Menus: Denote the special pages in the Customizer menu editor. 
The special pages here are the pages that are used for the Privacy Policy, Home, and the Posts page.

Fixes #46829.
Props garrett-eclipse, audrasjb.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47539 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-05 21:17:06 +00:00
Sergey Biryukov
9782eb82ad Site Health: Display the original PHP memory limit on Site Health Info screen. 
This ensures that if the limit has been modified for admin screens by `wp_raise_memory_limit()`, the original value is displayed along with the current value.

Props Clorith, espiat, zodiac1978, SergeyBiryukov.
Fixes #49329.
Built from https://develop.svn.wordpress.org/trunk@47762


git-svn-id: http://core.svn.wordpress.org/trunk@47538 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-05 18:58:09 +00:00