Commit Graph

42385 Commits

Author SHA1 Message Date
Sergey Biryukov 12c8f0e678 Code Modernization: Introduce `is_gd_image()` to check for PHP 8 `GdImage` object instances.
In PHP 8, the GD extension uses `GdImage` objects instead of resources for its underlying data structures.

This updates the existing `is_resource()` calls for image resources in core to accomodate for `GdImage` instances as well.

Props ayeshrajans, jrf.
Fixes #50833.
Built from https://develop.svn.wordpress.org/trunk@48798


git-svn-id: http://core.svn.wordpress.org/trunk@48560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-16 13:33:09 +00:00
Sergey Biryukov a5edb2a8a1 Filesystem API: Use correct variable when closing the file handle in `WP_Filesystem_FTPext::get_contents()`.
Props gothick@gothick.org.uk.
Fixes #51029.
Built from https://develop.svn.wordpress.org/trunk@48797


git-svn-id: http://core.svn.wordpress.org/trunk@48559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-15 20:56:02 +00:00
TimothyBlynJacobs e1da1ae3e4 REST API: Add uniqueItems as a permitted endpoint argument JSON Schema keyword.
Support for the `uniqueItems` keyword was added in [48357], but wasn't included in the list of permitted keywords for `WP_REST_Controller::get_endpoint_args_for_item_schema()`. This prevented the keyword from being automatically supported if specified in a controller's item schema.

Fixes #51021.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-15 16:11:07 +00:00
Sergey Biryukov b29ea455e8 Menus: Make the `$object_id` parameter of `_wp_delete_post_menu_item()` required, for consistency with `_wp_delete_tax_menu_item()`.
The function is private (only intended for core usage) and is hooked to the `delete_post` action, which always passes a non-zero post ID.

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

See #50343.
Built from https://develop.svn.wordpress.org/trunk@48795


git-svn-id: http://core.svn.wordpress.org/trunk@48557 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-15 13:45:06 +00:00
Sergey Biryukov d3a3862248 Code Modernization: Fix PHP 8 deprecation notices for optional function parameters declared before required parameters.
As it already was not possible to pass the required parameters without also passing the optional one anyway, removing the default value for the (not so) optional parameters should not affect backward compatibility.

This change affects three functions in core:

* `get_comment_delimited_block_content()`
* `do_enclose()`
* `_wp_delete_tax_menu_item()`

Props jrf, ayeshrajans, desrosj.
Fixes #50343.
Built from https://develop.svn.wordpress.org/trunk@48794


git-svn-id: http://core.svn.wordpress.org/trunk@48556 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-15 13:40:03 +00:00
Sergey Biryukov 756de63216 Docs: Document the parameters of `wp_get_associated_nav_menu_items()` as optional.
See #50768.
Built from https://develop.svn.wordpress.org/trunk@48793


git-svn-id: http://core.svn.wordpress.org/trunk@48555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-15 13:12:06 +00:00
Sergey Biryukov 440eb31bb7 Site Health: Recognize `define( 'WP_AUTO_UPDATE_CORE', 'minor' )` as an acceptable value.
Previously, it was only incidentally recognized as valid due to a loose comparison with `true`.

With the strict comparison added to `WP_Site_Health_Auto_Updates::test_constants()`, this was no longer the case.

Follow-up to [47841].

Props sterndata, mukesh27, avixansa, desrosj, SergeyBiryukov.
Fixes #50912.
Built from https://develop.svn.wordpress.org/trunk@48792


git-svn-id: http://core.svn.wordpress.org/trunk@48554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-14 20:39:08 +00:00
Sergey Biryukov 27c5f5f1ab Tests: Consistently unregister custom settings after performing assertions in `WP_Test_REST_Settings_Controller`.
This ensures that those settings don't leak to other tests.

Props david.binda, TimothyBlynJacobs, SergeyBiryukov.
Fixes #50986.
Built from https://develop.svn.wordpress.org/trunk@48791


git-svn-id: http://core.svn.wordpress.org/trunk@48553 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-14 16:35:06 +00:00
Sergey Biryukov 703be7e1f3 Code Modernization: Change `create_function()` in `phpunit/includes/plural-form-function.php` to closure.
`create_function()` has been deprecated in PHP >= 7.2 and removed in PHP 8.

The only instance left in core was used in a test that was being skipped on PHP >= 7.2. This allows the test to run again.

Follow-up to [41722], [41730].

Props jrf.
Fixes #50899.
Built from https://develop.svn.wordpress.org/trunk@48790


git-svn-id: http://core.svn.wordpress.org/trunk@48552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-13 12:34:10 +00:00
Sergey Biryukov 07ec574a54 Code Modernization: Only call `libxml_disable_entity_loader()` in PHP < 8.
This function has been deprecated in PHP 8.0 because in libxml 2.9.0, external entity loading is disabled by default, so this function is no longer needed to protect against XXE attacks.

Props jrf.
Fixes #50898.
Built from https://develop.svn.wordpress.org/trunk@48789


git-svn-id: http://core.svn.wordpress.org/trunk@48551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-12 15:25:03 +00:00
Sergey Biryukov 3ccc91894b Code Modernization: Remove `final` keyword from private methods.
Declaring a `private` method as `final` is an oxymoron, as `private` methods cannot be overloaded anyway.

Using `final private function...` will generate a warning in PHP 8.

Props jrf.
Fixes #50897.
Built from https://develop.svn.wordpress.org/trunk@48788


git-svn-id: http://core.svn.wordpress.org/trunk@48550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-12 15:05:08 +00:00
desrosj dc63fb7c85 Help/About: Final adjustments to the 5.5 About page.
- Final CDN asset URLs.
- Some minor color adjustments.

Props ryelle, marybaum, davidbaumwald, audrasjb, estelaris, afercia, cbringmann, andreamiddleton, desrosj, SergeyBiryukov, ocean90, nrqsnchz, spacedmonkey, whyisjake, man4toman.
Fixes #50416.
Built from https://develop.svn.wordpress.org/trunk@48783


git-svn-id: http://core.svn.wordpress.org/trunk@48545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-11 16:53:09 +00:00
Sergey Biryukov 1f85e7484f Docs: Consistently use third-person singular verbs for various filter descriptions, per the documentation standards.
See #50768.
Built from https://develop.svn.wordpress.org/trunk@48782


git-svn-id: http://core.svn.wordpress.org/trunk@48544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-11 00:34:08 +00:00
Sergey Biryukov 4da5577136 Docs: Update documentation for `get_{$meta_type}_metadata` filter for consistency with `default_{$meta_type}_metadata`.
Follow-up to [48777].

See #50891.
Built from https://develop.svn.wordpress.org/trunk@48778


git-svn-id: http://core.svn.wordpress.org/trunk@48540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-10 15:50:04 +00:00
whyisjake 52df01d961 Options, Meta APIs: Update the docs around default metadata values.
Add a missing @since value for 5.5 and potential default filter names.

Fixes #50891.
Props johnbillion.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48539 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-10 15:42:04 +00:00
desrosj 14d561ac57 Bundled Themes: Bump theme versions ahead of WordPress 5.5.
The following theme versions will be released in coordination with WordPress 5.5:
- Twenty Ten: 3.1
- Twenty Eleven: 3.5
- Twenty Twelve: 3.2
- Twenty Thirteen: 3.1
- Twenty Fourteen: 2.9
- Twenty Fifteen: 2.7
- Twenty Sixteen: 2.2
- Twenty Seventeen: 2.4
- Twenty Nineteen: 1.7
- Twenty Twenty: 1.5

Props whyisjake, desrosj.
Fixes #50769.
Built from https://develop.svn.wordpress.org/trunk@48775


git-svn-id: http://core.svn.wordpress.org/trunk@48537 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-10 15:32:05 +00:00
desrosj 5a6fef41f3 Build/Test Tools: Update `elliptic` in Twenty Twenty.
See #50769.
Built from https://develop.svn.wordpress.org/trunk@48774


git-svn-id: http://core.svn.wordpress.org/trunk@48536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-10 15:19:03 +00:00
ellatrix 3bf88764f1 Editor: update packages
Fixes #50888

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


git-svn-id: http://core.svn.wordpress.org/trunk@48534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-10 14:18:33 +00:00
Sergey Biryukov 9214595e90 I18N: Fix typo in a screen reader text string on the About page.
Follow-up to [48729].

Props pedromendonca.
Fixes #50884.
Built from https://develop.svn.wordpress.org/trunk@48770


git-svn-id: http://core.svn.wordpress.org/trunk@48532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-10 13:15:04 +00:00
Sergey Biryukov 113acf42d5 I18N: Add a `class_exists()` check to `Plural_Forms` class for consistency with other POMO library classes.
Follow-up to [41722].

Fixes #50881.
Built from https://develop.svn.wordpress.org/trunk@48769


git-svn-id: http://core.svn.wordpress.org/trunk@48531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-10 11:33:09 +00:00
Sergey Biryukov 18cd7519e1 I18N: Fix typo in a string in `rest_validate_value_from_schema()`.
Props pedromendonca.
Fixes #50879.
Built from https://develop.svn.wordpress.org/trunk@48767


git-svn-id: http://core.svn.wordpress.org/trunk@48529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-09 02:00:04 +00:00
Sergey Biryukov 5c0361aeb1 Coding Standards: Remove a few more extra brackets from some conditions in `wp-admin/includes/plugin.php`.
Follow-up to [48764].

See #50767.
Built from https://develop.svn.wordpress.org/trunk@48766


git-svn-id: http://core.svn.wordpress.org/trunk@48528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-09 01:56:05 +00:00
Sergey Biryukov 350ad6141e Coding Standards: Use consistent formatting for translator comments in `wp-includes/rest-api.php`.
See #50767.
Built from https://develop.svn.wordpress.org/trunk@48765


git-svn-id: http://core.svn.wordpress.org/trunk@48527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-09 01:46:07 +00:00
Sergey Biryukov 004e3f897f Coding Standards: Fix WPCS issues in `wp-admin/includes/plugin.php`.
Includes minor code layout fixes for better readability.

Props rnaby for initial patch.
See #50767, #43848.
Built from https://develop.svn.wordpress.org/trunk@48764


git-svn-id: http://core.svn.wordpress.org/trunk@48526 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-08 21:04:04 +00:00
Sergey Biryukov f5a4ac614e Coding Standards: Simplify some parts of `user_can_access_admin_page()` for better readability.
Props rnaby, valentinbora, khag7.
Fixes #43848.
Built from https://develop.svn.wordpress.org/trunk@48762


git-svn-id: http://core.svn.wordpress.org/trunk@48524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-08 20:24:05 +00:00
Sergey Biryukov 1e5b6101e7 Help/About: Update videos and their descriptions on the About page.
Follow-up to [48675], [48686], [48721], [48729], [48730], [48736].

Props ryelle, marybaum, estelaris, desrosj, joen, afercia.
See #50416.
Built from https://develop.svn.wordpress.org/trunk@48761


git-svn-id: http://core.svn.wordpress.org/trunk@48523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-08 14:16:02 +00:00
Sergey Biryukov 132942b9fa Docs: Document the return value of `get_settings_errors()` using hash notation.
Props stevenlinx, webdevmattcrom, atachibana.
Fixes #42786.
Built from https://develop.svn.wordpress.org/trunk@48760


git-svn-id: http://core.svn.wordpress.org/trunk@48522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-08 12:39:06 +00:00
whyisjake 649ab58d96 Themes: Update the `test_theme_supports_custom_logo` to check for the `unlink-homepage-logo` property.
See #37011, [48757].
Props TimothyBlynJacobs, whyisjake.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48520 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-07 20:44:05 +00:00
Sergey Biryukov 7690f48cec Themes: Add `unlink-homepage-logo` to the `create_initial_theme_features()` registration for the `custom-logo` theme feature.
Follow-up to [48039], [48283], [48749].

Props TimothyBlynJacobs.
Fixes #37011.
Built from https://develop.svn.wordpress.org/trunk@48757


git-svn-id: http://core.svn.wordpress.org/trunk@48519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-07 19:43:05 +00:00
Andrew Ozz 283f841dac Script Loader: Remove the `jquery-migrate-compat-5.5` temporary script handle for now. Can be re-added later if there is a compelling use case. For now it doesn't seem necessary.
See #37110.
Built from https://develop.svn.wordpress.org/trunk@48754


git-svn-id: http://core.svn.wordpress.org/trunk@48516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-07 18:30:06 +00:00
Sergey Biryukov ddcf09ace3 Script Loader: Add a temporary `jquery-migrate-compat-5.5` script handle.
This is intended as an easy way for plugins and themes to still be able to load jQuery with jQuery Migrate in WordPress 5.5.

Once jQuery is updated to 3.x, this temporary script handle will be removed. This means plugins and themes still using it at that point will fail to load their scripts (as a dependency will be missing), but will not cause "fatal errors" breaking the rest of JS.

Follow-up to [48323], [48324].

Props azaozz, desrosj, apedog, Clorith, jorbin.
Fixes #37110.
Built from https://develop.svn.wordpress.org/trunk@48753


git-svn-id: http://core.svn.wordpress.org/trunk@48515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-07 16:51:06 +00:00
Sergey Biryukov 961f455a00 Comments: Update DB version number used to trigger the upgrade routine for changing the `comment_type` DB field value in comments table.
Follow-up to [47597], [47626], [48225], [48227], [48748].

Props desrosj.
See #49236.
Built from https://develop.svn.wordpress.org/trunk@48751


git-svn-id: http://core.svn.wordpress.org/trunk@48513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-07 16:32:03 +00:00
Sergey Biryukov 6b5e748dee Docs: Correct usage of the dynamic `auto_update_{$type}` filter.
This ensures that the canonical name of the filter is used in Site Health debug data, as well as on plugin and theme screens, so the developer reference site remains correct.

Props johnbillion.
Fixes #50868.
Built from https://develop.svn.wordpress.org/trunk@48750


git-svn-id: http://core.svn.wordpress.org/trunk@48512 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-07 16:14:03 +00:00
Sergey Biryukov df6e548b14 Accessibility: Themes: Only unlink custom logo on the home page if the theme declares support for that.
To accommodate for the change, the `custom-logo` theme feature now accepts the `unlink-homepage-logo` parameter.

If and when the logo is linked on the home page, the link has the `aria-current` attribute for better accessibility.

Follow-up to [48039], [48283].

Props sabernhardt, audrasjb, johnstonphilip, demetris.
Fixes #37011.
Built from https://develop.svn.wordpress.org/trunk@48749


git-svn-id: http://core.svn.wordpress.org/trunk@48511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-07 15:26:03 +00:00
Sergey Biryukov c64297ce61 Comments: Update comment cache in the upgrade routine for changing the `comment_type` DB field value in comments table.
This ensures that comment object cache is cleared after changing the comment type to `comment` instead of an empty string.

Add a unit test for `_wp_batch_update_comment_type()`.

Follow-up to [47597], [47626], [48225], [48227].

Props imath, westonruter.
Fixes #49236.
Built from https://develop.svn.wordpress.org/trunk@48748


git-svn-id: http://core.svn.wordpress.org/trunk@48510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-07 14:29:02 +00:00
Sergey Biryukov 5221a27593 Site Health: Consistently pass an object to the `auto_update_{$type}` filter in Site Health debug data.
Previously, some instances of the filter received an array from a plugin or theme update response, potentially triggering PHP notices.

Props bpayton, pbiron.
Fixes #50852.
Built from https://develop.svn.wordpress.org/trunk@48745


git-svn-id: http://core.svn.wordpress.org/trunk@48507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-07 13:28:05 +00:00
Sergey Biryukov 68dd986b07 Tests: Correct duplicate array keys in `Tests_Kses::test_wp_filter_post_kses_address()`.
Previously, only the last `style` value was actually tested.

Props ediamin.
Fixes #50860.
Built from https://develop.svn.wordpress.org/trunk@48744


git-svn-id: http://core.svn.wordpress.org/trunk@48506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-06 13:28:05 +00:00
Sergey Biryukov 3a32284b26 Posts, Post Types: Use a consistent wording in messages about a locked post.
Props ramiy.
Fixes #50859.
Built from https://develop.svn.wordpress.org/trunk@48743


git-svn-id: http://core.svn.wordpress.org/trunk@48505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-06 13:14:08 +00:00
Sergey Biryukov 7e1e4f379a Site Health: Check if `session_status()` exists before calling it.
Props bgermann.
Fixes #50862.
Built from https://develop.svn.wordpress.org/trunk@48742


git-svn-id: http://core.svn.wordpress.org/trunk@48504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-06 00:25:07 +00:00
Sergey Biryukov ee213e333b Comments: Remove a few more unnecessary instances of `esc_html()` in `WP_Comments_List_Table::comment_status_dropdown()`.
Core translations are considered safe, and these labels are not escaped in any other instances.

Follow-up to [48521], [48722], [48724].

See #40188, #50815.
Built from https://develop.svn.wordpress.org/trunk@48741


git-svn-id: http://core.svn.wordpress.org/trunk@48503 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-05 13:53:06 +00:00
Sergey Biryukov 2f878f1e74 Help/About: Correct header spacing on shorter screens after removing the musician name.
Remove some unnecessary CSS.

Follow-up to [48730].

Props ryelle.
See #50416.
Built from https://develop.svn.wordpress.org/trunk@48736


git-svn-id: http://core.svn.wordpress.org/trunk@48498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-04 18:11:09 +00:00
Sergey Biryukov aaf49752b2 Plugins: Move the "Successfully installed the plugin" string to the correct `Plugin_Upgrader` method.
The string refers to the installation, and belongs in the `::install_strings()` method, not in `::upgrade_strings()`.

Props sswebster, nateinaction, SergeyBiryukov.
Fixes #50837.
Built from https://develop.svn.wordpress.org/trunk@48734


git-svn-id: http://core.svn.wordpress.org/trunk@48496 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-04 17:54:04 +00:00
whyisjake b84d7f1fd3 Site Health: Display auto-update properly for plugins that don't support auto-updates.
Properly filter `auto_update_plugin` when displaying the table.

Fixes #50822.
Props Gwendydd, pbiron, audrasjb, SergeyBiryukov, whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48493 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-04 17:37:02 +00:00
desrosj fa9b043313 Help/About: Remove “Musician Name” placeholder.
The musician name is traditionally not included on the About page due to i18n concerns regarding last minute changes.

Props audrasjb, SergeyBiryukov.
See #50416.
Built from https://develop.svn.wordpress.org/trunk@48730


git-svn-id: http://core.svn.wordpress.org/trunk@48492 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-04 17:35:06 +00:00
desrosj 527ca5ff78 Help/About: String updates and accessibility improvements to the 5.5 About page.
Props ryelle, nrqsnchz, desrosj, audrasjb, marybaum, spacedmonkey, SergeyBiryukov, estelaris, afercia, ocean90.
See #50416.
Built from https://develop.svn.wordpress.org/trunk@48729


git-svn-id: http://core.svn.wordpress.org/trunk@48491 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-04 17:26:03 +00:00
Sergey Biryukov a9da1150ee Editor: Make some hardcoded strings in block patterns translatable.
Props ocean90, youknowriad.
Fixes #50842.
Built from https://develop.svn.wordpress.org/trunk@48726


git-svn-id: http://core.svn.wordpress.org/trunk@48488 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-04 17:01:05 +00:00
ellatrix 69370fa0da Editor: update JS packages
Fixes #50844.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48487 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-04 16:48:43 +00:00
Sergey Biryukov 315db55458 Comments: Restore the `::has_items()` call in `WP_Comments_List_Table::extra_tablenav()` for now, until unit tests are updated accordingly.
Follow-up to [48722].

Fixes #40188. See #50815.
Built from https://develop.svn.wordpress.org/trunk@48724


git-svn-id: http://core.svn.wordpress.org/trunk@48486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-04 16:26:03 +00:00
Sergey Biryukov b615c45103 Comments: Use the existing static variable instead of calling `::has_items()` again in `WP_Comments_List_Table::extra_tablenav()`.
Additionally, removed unnecessary `esc_html()` on the Filter button label. Core translations are considered safe, and this label is not escaped in any other instance.

Props whyisjake, SergeyBiryukov.
Fixes #40188.
Built from https://develop.svn.wordpress.org/trunk@48722


git-svn-id: http://core.svn.wordpress.org/trunk@48484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-04 15:58:06 +00:00
whyisjake 500c0118d4 Help/About: String update for 5.5 release.
We don't use hyphens for the [block editor](https://make.wordpress.org/core/handbook/best-practices/spelling/).

See #50416.
Props davidbaumwald, marybaum, desrosj.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-08-04 15:56:02 +00:00