Commit Graph

43096 Commits

Author SHA1 Message Date
TimothyBlynJacobs
4e3c568fb1 REST API: Only include the controller's own taxonomy in it's schema.
Previously, all taxonomies were incorrectly exposed as possible values.

Props johnbillion.
Fixes #51940.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49621 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-01-02 23:49:05 +00:00
TimothyBlynJacobs
5363474e5d App Passwords: Ensure the Add New button isn't hidden on mobile.
Also removes an unnecessary `!important` rule introduced in [49772] when fixing a similar issue.

Props vladytimy, mukesh27.
Fixes #51980.
See [49772].

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


git-svn-id: http://core.svn.wordpress.org/trunk@49620 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-01-02 22:36:05 +00:00
TimothyBlynJacobs
6d3109dd2a App Passwords: Correct authorize app action names and signatures.
When App Passwords was introduced, the `wp_authorize_application_password_form` and `wp_application_passwords_approve_app_request_success` hook were mistakenly duplicated and incorrectly documented. This commit corrects the hook names and ensures the correct parameters are passed.

Props johnbillion, engahmeds3ed.
Fixes #52013.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49619 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-01-02 22:21:04 +00:00
TimothyBlynJacobs
fa88bbfc79 App Passwords: Only attempt auth if the username and password are set.
Previously, only the username was checked which caused a PHP warning in some server setups, for instance Shibboleth SSO, where the server only populates the `PHP_AUTH_USER` field.

Props MadtownLems, johnbillion, richard.tape, engahmeds3ed.
Fixes #52003.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49618 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-01-02 21:35:04 +00:00
TimothyBlynJacobs
c56eb69d7d REST API: Properly display JSON encoding errors.
Previously `null` was returned because the server was accessing the incorrect variable.

Props atimmer, technosailor.
Fixes #52106.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49617 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-01-02 20:36:06 +00:00
TimothyBlynJacobs
33cb202f07 Site Health: Use a front-end URL for loopback tests.
In [49154] the async Site Health tests were changed to use the REST API instead of admin-ajax. An unintended side effect of this change was that the loopback tests which tried to ping the site's `admin_url()` were no longer authenticated because admin-cookies aren't provided to the REST API.

This commit adjusts the loopback test to use the front-end `site_url` which checks that cron will function properly. A follow-up ticket will focus on tests that will cover the file editor checks.

Props Clorith.
Fixes #52097.
See #48105.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49616 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-01-02 20:09:08 +00:00
Sergey Biryukov
e596f54ecc Build/Test Tools: Check if Travis/GitHub Actions environment variables are defined.
This adjusts the logic for determining whether to skip some tests when not in the primary branch, and allows for running these tests locally.

Follow-up to [47000], [47001], [49264], [49267], [49280].

See #50401.
Built from https://develop.svn.wordpress.org/trunk@49916


git-svn-id: http://core.svn.wordpress.org/trunk@49615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-01-02 12:21:06 +00:00
Sergey Biryukov
8c8af01d86 Happy New Year!
Update copyright year to 2021 in `license.txt` and bundled themes.
Built from https://develop.svn.wordpress.org/trunk@49915


git-svn-id: http://core.svn.wordpress.org/trunk@49614 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-01-01 00:19:07 +00:00
Sergey Biryukov
2818d14fa8 Twenty Twenty-One: Remove extra brackets from :last-child CSS pseudo-class.
Props munyagu, mukesh27, activecoder.
Fixes #52176.
Built from https://develop.svn.wordpress.org/trunk@49914


git-svn-id: http://core.svn.wordpress.org/trunk@49613 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-31 07:38:06 +00:00
Sergey Biryukov
25441f33f8 Tests: Disable update checks while running REST API plugin installation tests.
This prevents external HTTP requests that are not required for the tests in question and may interfere with the results in case of a timeout.

Follow-up to [48242], [49491].

See #51669.
Built from https://develop.svn.wordpress.org/trunk@49913


git-svn-id: http://core.svn.wordpress.org/trunk@49612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-30 19:04:10 +00:00
Sergey Biryukov
ee7c953731 Docs: Second pass at replacing Codex URLs with a corresponding HelpHub or DevHub article.
Follow-up to [45674-45677].

Props marcio-zebedeu, zodiac1978, netweb.
See #48987.
Built from https://develop.svn.wordpress.org/trunk@49912


git-svn-id: http://core.svn.wordpress.org/trunk@49611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-29 20:14:11 +00:00
Andrew Ozz
0f0b303d5a Editor: Trigger the tinymce-editor-init custom jQuery event on DOM ready. Otherwise TinyMCE may initialize earlier and handlers attached on DOM ready may not get triggered. Fixes making the editor menu "sticky" and setting/resetting some screen options on the old Edit Post screen.
Fixes 52046, 51995.
Built from https://develop.svn.wordpress.org/trunk@49911


git-svn-id: http://core.svn.wordpress.org/trunk@49610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-29 13:21:07 +00:00
Sergey Biryukov
fa83e92c76 Export: Add post_modified and post_modified_gmt fields to the generated WXR export file.
This allows for more flexibility when determining which version of a post is the latest one, and makes it possible to implement import logic involving updating and adding revisions to existing posts or pages.

Props jmdodd.
Fixes #52180.
Built from https://develop.svn.wordpress.org/trunk@49910


git-svn-id: http://core.svn.wordpress.org/trunk@49609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-28 15:26:08 +00:00
Gary Pendergast
4dc59b954a Site Health: Check that WordPress is installed before scheduling the HTTPS cron.
Trying to schedule cron jobs before WordPress is installed results in DB errors, which is suboptimal.

See #47577.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-28 01:45:06 +00:00
Sergey Biryukov
1fd05dee6e Site Health: Add WP_MEMORY_LIMIT constant to debug info.
This complements the `WP_MAX_MEMORY_LIMIT` constant previously displayed there.

Props sanketchodavadiya, nre, talldanwp, noisysocks.
Fixes #51680.
Built from https://develop.svn.wordpress.org/trunk@49908


git-svn-id: http://core.svn.wordpress.org/trunk@49607 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-27 19:27:06 +00:00
Sergey Biryukov
3f05756219 Accessibility: Upgrade/Install: Add more contrast to input borders during installation.
This brings the accessibility improvements previously made for other areas of the admin in WordPress 5.3 to the installation screens too.

Follow-up to [46241-46244], [46247], [46248], [46293], [46425].

Props Maigret, audrasjb.
Fixes #51854.
Built from https://develop.svn.wordpress.org/trunk@49907


git-svn-id: http://core.svn.wordpress.org/trunk@49606 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-26 19:54:07 +00:00
Sergey Biryukov
c3b89441f7 Docs: Correct the type of the $user parameter in WP_REST_Users_Controller::prepare_links().
Props iviweb, mukesh27.
Fixes #52175.
Built from https://develop.svn.wordpress.org/trunk@49906


git-svn-id: http://core.svn.wordpress.org/trunk@49605 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-25 14:54:07 +00:00
Sergey Biryukov
5a7fa8b7f3 Posts, Post Types: Correct the check for term IDs to be queued for lazy-loading term meta.
This ensures that the `$term_ids` array in `wp_queue_posts_for_term_meta_lazyload()` (an indexed array not keyed by ID) does not contain duplicate values.

Props denishua, akabarikalpesh.
Fixes #52144.
Built from https://develop.svn.wordpress.org/trunk@49905


git-svn-id: http://core.svn.wordpress.org/trunk@49604 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-24 11:21:04 +00:00
Felix Arntz
c81db1f6e6 Security, Site Health: Detect HTTPS support and encourage switching.
This changeset modifies the Site Health panel for HTTPS to provide more accurate recommendations based on whether the environment is already set up for HTTPS.

* Introduces `wp_is_using_https()` to check whether the site is configured to use HTTPS (via its Site Address and WordPress Address).
* Introduces `wp_is_https_supported()` to check whether the environment supports HTTPS. This relies on a cron job which periodically checks support using a loopback request.

Props Clorith, flixos90, miinasikk, westonruter.
Fixes #47577.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-23 19:13:04 +00:00
Aaron Jorbin
9f4be0f698 Build/Test: Send Code Coverage reports to Codecov.
Help visualize and explore code coverage reports to avoid blunders.

Props desrosj, swissspidy.
Fixes #52141.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49602 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-23 18:19:05 +00:00
Sergey Biryukov
4a91698129 Tests: Correct @ticket references in tests/query/invalidQueries.php.
This ensures that running `phpunit --group 48556` works as expected.

Follow-up to [49900].

See #48556.
Built from https://develop.svn.wordpress.org/trunk@49902


git-svn-id: http://core.svn.wordpress.org/trunk@49601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-23 15:07:03 +00:00
Sergey Biryukov
c18ec08dbb Twenty Nineteen: Correct @since version for twentynineteen_excerpt_more().
Follow-up to [49831].

See #46177.
Built from https://develop.svn.wordpress.org/trunk@49901


git-svn-id: http://core.svn.wordpress.org/trunk@49600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-23 15:05:08 +00:00
Peter Wilson
c50ff2ac10 Query: Add bad path tests with invalid WP_Query parameters.
See #48556.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49599 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-23 03:05:06 +00:00
Peter Wilson
aaf7710529 Query: Revert post-type specific capability changes.
The modified checks of the `read_private_posts` capability could result in unexpected SQL queries when calling `WP_Query` with invalid parameters.

Reverts [49830], [49832] and [49833].
See #48556.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49598 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-23 03:02:06 +00:00
desrosj
7c8d9b2e6a Build/Test Tools: Remove the TravisCI configuration file.
In [49162], GitHub Action workflow configuration files were introduced to run all of Core’s automated testing with the intent to fully transition after some time was allowed for testing.

After two full months of testing, the time to finish this transition has come.

We thank TravisCI for testing the codebase through nearly 20 major and many more minor releases.

Fixes #52161. See #50401.
Built from https://develop.svn.wordpress.org/trunk@49876


git-svn-id: http://core.svn.wordpress.org/trunk@49595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-22 21:01:10 +00:00
desrosj
51ca44d9c7 Bundled Themes: Bump the versions of Twenty Twenty-One and Twenty Nineteen.
New versions:

- Twenty Twenty-One: 1.1.
- Twenty Nineteen: 1.9.

Props poena.
Fixes #52160.
Built from https://develop.svn.wordpress.org/trunk@49873


git-svn-id: http://core.svn.wordpress.org/trunk@49592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-22 18:19:05 +00:00
desrosj
0111002414 Twenty Nineteen: Add the block-patterns tag to the appropriate SASS file.
This prevents the tag from being removed from `styles.css` when rebuilding the CSS.

Props danfarrow
Fixes #52159.
Built from https://develop.svn.wordpress.org/trunk@49872


git-svn-id: http://core.svn.wordpress.org/trunk@49591 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-22 18:15:09 +00:00
ryelle
f8e65a20b6 Twenty Twenty-One: Set a maximum width on inputs.
Text inputs with a size attribute can end up longer than the screen width on small screens. A max-width of 100% keeps the inputs from breaking out of the container.

Props basscan, kjellr, poena, sabernhardt
Fixes #52083.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-22 16:53:06 +00:00
desrosj
de18e6c5a2 Twenty Twenty-One: Improve strings found in post navigations for easier translating.
This change adjusts strings found within post navigations to ensure translators are provided the full context needed to properly translate.

Props poena, SergeyBiryukov, aristath.
Fixes #52047.
Built from https://develop.svn.wordpress.org/trunk@49866


git-svn-id: http://core.svn.wordpress.org/trunk@49585 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-22 16:15:06 +00:00
desrosj
b0fe9f059c Twenty Twenty-One: Only load IE specific polyfills when actually using Internet Exploreer.
The `twenty-twenty-one-ie11-polyfills` script now has a `null` source, and the new `twenty-twenty-one-ie11-polyfills-asset` (which points to the actual `polyfills.js` source) will be loaded only if IE is detected by through the use of `wp_get_script_polyfill()`.

Because the original script name remains the same, this change is backwards compatible with any code registering `twenty-twenty-one-id11-polyfills` as a script dependency.

Props poena, ismail.elkorchi, peterwilsoncc
Fixes #52098.
Built from https://develop.svn.wordpress.org/trunk@49865


git-svn-id: http://core.svn.wordpress.org/trunk@49584 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-22 15:44:08 +00:00
desrosj
c58be3c57e Twenty Twenty-One: Improve striped table styling in Dark Mode.
This change improves the display of table blocks with the “Stripes” style selected.

Previously, the text was not visible in striped rows when using Dark Mode.

Props ryelle, poena, melchoyce, celendesign, audrasjb.
Fixes #52129.
Built from https://develop.svn.wordpress.org/trunk@49864


git-svn-id: http://core.svn.wordpress.org/trunk@49583 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-22 15:02:05 +00:00
Sergey Biryukov
aedf6c6443 Tests: Use shared post fixture in comment template tests.
This reinstates [49848], previously reverted in [49849], with the addition of `static` keyword for the `wpSetUpBeforeClass()` method, allowing the tests to pass on PHP 8.

Props peterwilsoncc.
See #51802.
Built from https://develop.svn.wordpress.org/trunk@49863


git-svn-id: http://core.svn.wordpress.org/trunk@49582 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-22 07:44:06 +00:00
John Blackbourn
ec80a9fd63 XML-RPC: Emit an appropriate HTTP status code when an error is returned in response to an XML-RPC request.
This most notably affects the response when XML-RPC is disabled or when the supplied username and password is incorrect.

Props ericmann

Fixes #48213

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


git-svn-id: http://core.svn.wordpress.org/trunk@49581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 20:23:02 +00:00
desrosj
b8e5751dd1 Twenty Twenty-One: Do not specify loading=“eager” for single post thumbnails.
While `loading=“eager”` is a supported alternative to omitting the attribute entirely, browsers follow the value of this attribute explicitly when specified.

Specifying `eager` would prevent the user from receiving any additional potential benefits implemented at the browser level, such as further mechanisms to automatically decide which elements to lazy-load.

Props flixos90, ryelle, poena.
Fixes #52139.
Built from https://develop.svn.wordpress.org/trunk@49860


git-svn-id: http://core.svn.wordpress.org/trunk@49579 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 18:39:03 +00:00
Sergey Biryukov
1d3fd41977 Docs: Move locale filter documentation to the canonical place.
See #51800.
Built from https://develop.svn.wordpress.org/trunk@49859


git-svn-id: http://core.svn.wordpress.org/trunk@49578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 18:27:04 +00:00
Sergey Biryukov
5550b5fd6a Docs: Move sanitize_file_name filter documentation to the canonical place.
See #51800.
Built from https://develop.svn.wordpress.org/trunk@49858


git-svn-id: http://core.svn.wordpress.org/trunk@49577 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 18:25:05 +00:00
John Blackbourn
f508fe5112 Build/Test Tools: Don't mark the Tests_Cache::test_flush() test as risky when running the test suite with an object cache in place.
See #51802

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


git-svn-id: http://core.svn.wordpress.org/trunk@49576 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 17:51:07 +00:00
John Blackbourn
cc2dd60fe1 XML-RPC: Fix a type error when requesting the menu field of a taxonomy.
Fixes #51493

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


git-svn-id: http://core.svn.wordpress.org/trunk@49575 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 17:11:05 +00:00
desrosj
55209a7309 Twenty Twenty-One: Allow local anchor links to be used in primary navigation.
This adds some JavaScript to detect when an anchor link is clicked within the primary navigation on mobile devices and closes the menu before scrolling to the location on the page.

Props poena, macmanx, t-p.
Fixes #52006.
Built from https://develop.svn.wordpress.org/trunk@49854


git-svn-id: http://core.svn.wordpress.org/trunk@49573 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 15:05:08 +00:00
gziolo
671d5da0e4 Blocks: Align with Gutenberg the name of generated asset handle for core blocks
Related Gutenberg PR: https://github.com/WordPress/gutenberg/pull/25220.

It aligns with the latest changes added by aristath to the Gutenberg project. As part of styles splitting for core blocks, there was a special pattern introduced for how style handles are named. Ideally, we would apply it to all blocks but there might be some backward compatibility considerations so I left the handling for non-core blocks unchanged.

Props aristath.
See #50328.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49569 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 11:39:08 +00:00
Peter Wilson
65351d3908 Tests: Revert use of shared post fixture in comment template tests.
Removes code throwing a fatal in PHP 8.

Reverts [49848] from trunk.
See #51802.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 03:35:04 +00:00
Peter Wilson
c56ec035ce Tests: Use shared post fixture in comment template tests.
See #51802.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 03:17:01 +00:00
Peter Wilson
7a3d769b0f Query: Correct some coding standards after [49843].
See #44183

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


git-svn-id: http://core.svn.wordpress.org/trunk@49566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 02:56:05 +00:00
John Blackbourn
8bc6a4ae6d Query: Correct some coding standards after [49843].
See #44183
Built from https://develop.svn.wordpress.org/trunk@49846


git-svn-id: http://core.svn.wordpress.org/trunk@49565 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 00:33:08 +00:00
John Blackbourn
e7cc15b321 Upload: Introduce the {$action}_overrides filter that allows the overrides parameter for file uploads and file sideloads to be filtered.
The dynamic portion of the hook name, `$action`, refers to the post action.

Props iandunn, jakub.tyrcha, nacin, wonderboymusic, Mte90, johnbillion

Fixes #16849

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


git-svn-id: http://core.svn.wordpress.org/trunk@49564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-20 16:15:03 +00:00
John Blackbourn
f0d44a3402 Mail: Introduce a pre_wp_mail filter to allow short-circuiting the wp_mail() function without having to override the pluggable function.
Props DvanKooten, swissspidy, SergeyBiryukov, jtsternberg, ericlewis, Mte90, birgire, ayeshrajans

Fixes #35069

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


git-svn-id: http://core.svn.wordpress.org/trunk@49563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-20 15:09:06 +00:00
John Blackbourn
5007f1ce13 Query: Ensure the author archive title always shows the name of the queried author, regardless of whether there are results.
This brings the behaviour inline with the `<title>` element of the page which always shows the author name.

Props Tkama, subrataemfluence

Fixes #44183

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


git-svn-id: http://core.svn.wordpress.org/trunk@49562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-20 14:37:04 +00:00
Sergey Biryukov
0fe844c9c9 Docs: Use a canonical form of "knowledgeable" in readme.html.
Props shahinsid07, audrasjb.
Fixes #52125.
Built from https://develop.svn.wordpress.org/trunk@49842


git-svn-id: http://core.svn.wordpress.org/trunk@49561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-20 12:58:02 +00:00
Sergey Biryukov
0e700c40ea Docs: Fix typo in getCursorMarkerSpan() DocBlock in js/_enqueues/wp/editor/base.js.
Props voboghure, mukesh27, audrasjb.
Fixes #52128.
Built from https://develop.svn.wordpress.org/trunk@49841


git-svn-id: http://core.svn.wordpress.org/trunk@49560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-20 12:32:11 +00:00
Sergey Biryukov
e4dfced545 Twenty Ten: Correct $post_title variable name in loop-attachment.php.
Follow-up to [45609] / #47632.

Props sabernhardt.
Fixes #52121.
Built from https://develop.svn.wordpress.org/trunk@49840


git-svn-id: http://core.svn.wordpress.org/trunk@49559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-19 20:45:05 +00:00