Commit Graph

41472 Commits

Author SHA1 Message Date
Sergey Biryukov 77eb929b52 Upgrade/Install: Introduce `wp_in_maintenance_mode()`, a helper function to check if WordPress is currently in maintenance mode.
Props Clorith.
Fixes #49959.
Built from https://develop.svn.wordpress.org/trunk@47623


git-svn-id: http://core.svn.wordpress.org/trunk@47398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-25 20:19:07 +00:00
Sergey Biryukov 43cfa7ee60 Administration: Remove right padding on form tables on smaller screens so that the spacing is equal on both sides.
Additionally, reduce the right margin on screen meta links (Help and Screen Options) to align with the tables.

Props jainnidhi, garrett-eclipse, ibdz, SergeyBiryukov.
Fixes #43279.
Built from https://develop.svn.wordpress.org/trunk@47622


git-svn-id: http://core.svn.wordpress.org/trunk@47397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-25 12:27:11 +00:00
ianbelanger 72ef7ee315 Bundled Themes: Twenty Twenty remove unnecessary `$css_dependencies` variable in `twentytwenty_block_editor_styles()`.
Removes the unnecessary `$css_dependencies` variable in `twentytwenty_block_editor_styles()`.

Props ocean90, Dency.
Fixes #49986.
Built from https://develop.svn.wordpress.org/trunk@47618


git-svn-id: http://core.svn.wordpress.org/trunk@47393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-24 14:59:07 +00:00
Sergey Biryukov ced8fb20a1 Code Modernization: Remove error suppression from `parse_url()` calls.
Previously, the `@` operator was used to prevent possible warnings emitted by `parse_url()` in PHP < 5.3.3 when URL parsing failed.

Now that the minimum version of PHP required by WordPress is 5.6.20, this is no longer needed.

Props netpassprodsr, Howdy_McGee.
Fixes #49980. See #24780.
Built from https://develop.svn.wordpress.org/trunk@47617


git-svn-id: http://core.svn.wordpress.org/trunk@47392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-24 07:28:10 +00:00
Sergey Biryukov 0dc461c72e Networks and Sites: Don't display an empty Menu Settings section in network admin if there are no items.
This accounts for returning an empty array from the `mu_menu_items` filter.

Props dlh.
Fixes #49977.
Built from https://develop.svn.wordpress.org/trunk@47616


git-svn-id: http://core.svn.wordpress.org/trunk@47391 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-23 18:58:05 +00:00
Sergey Biryukov b6c70b7712 Embeds: Fix incorrect usage of `get_home_url()` in oEmbed tests.
Switch to `home_url()` for consistency with other tests and to avoid confusion.

Props david.binda.
Fixes #49988.
Built from https://develop.svn.wordpress.org/trunk@47615


git-svn-id: http://core.svn.wordpress.org/trunk@47390 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-23 18:41:07 +00:00
ianbelanger f97ac354c6 Bundled Themes: Twenty Twenty button styles produce inconsistent output and cannot be edited.
Fixes the issue with button styles not working when the Gutenberg plugin is activated while maintaining backwards compatibility.

Props nrqsnchz, poena, kjellr.
Fixes #49896.
Built from https://develop.svn.wordpress.org/trunk@47614


git-svn-id: http://core.svn.wordpress.org/trunk@47389 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-23 15:41:09 +00:00
ianbelanger 4632322382 Bundled Themes: Twenty Twenty resized images are centered inside the editor (with no alignment set) since WordPress 5.4.
Fixes the image alignment issue by removing `margin-left: auto;` and `margin-right: auto;` from `.editor-styles-wrapper .wp-block-image.is-resized`.

Props dianeco, JavierCasares.
Fixes #49600.
Built from https://develop.svn.wordpress.org/trunk@47613


git-svn-id: http://core.svn.wordpress.org/trunk@47388 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-22 19:25:08 +00:00
desrosj a753e44d4e Bootstrap/Load: Deprecate `wp_unregister_GLOBALS()`.
The `register_globals` directive in PHP was deprecated in version 5.3 and removed entirely in 5.4.

Now that WordPress only supports PHP 5.6.20 and newer, the `wp_unregister_GLOBALS()` function can be deprecated.

Props ayeshrajans, desrosj, SergeyBiryukov.
Fixes #49938.
Built from https://develop.svn.wordpress.org/trunk@47612


git-svn-id: http://core.svn.wordpress.org/trunk@47387 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-22 15:42:09 +00:00
Sergey Biryukov 427405535f Docs: Synchronize parameter documentation for various metadata functions, update per the documentation standards.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@47611


git-svn-id: http://core.svn.wordpress.org/trunk@47386 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-22 10:31:09 +00:00
Sergey Biryukov 9aa0fff80e Docs: Document the default value of `$single` and `$prev_value` parameters in various metadata functions.
Props denisco.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@47610


git-svn-id: http://core.svn.wordpress.org/trunk@47385 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-22 09:40:10 +00:00
ianbelanger 29abe5c726 Bundled Themes: Twenty Twenty submenu items disappear underneath the Cover block.
Fixes the submenu issue by raising the z-index value of the site-header from 1 to 2.

Props kjellr, JavierCasares.
Fixes #49322.
Built from https://develop.svn.wordpress.org/trunk@47609


git-svn-id: http://core.svn.wordpress.org/trunk@47384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-21 20:06:08 +00:00
ianbelanger 116a9b3039 Bundled Themes: Twenty Twenty missed license for images.
Fixes the image license in the readme by removing screenshot.png.

Props h71, poena.
Fixes #49316.
Built from https://develop.svn.wordpress.org/trunk@47608


git-svn-id: http://core.svn.wordpress.org/trunk@47383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-21 19:43:09 +00:00
ianbelanger c9ea34b6b3 Bundled Themes: Twenty Twenty block editor inserter is missing the `+`.
Fixes the disappearing `+` in the block editor when using the latest version of the Gutenberg plugin, by adding support for the native Gutenberg editor styles and removing `color: inherit;` from Twenty Twenty's style.css.

Props nrqsnchz, .
Fixes #49610.
Built from https://develop.svn.wordpress.org/trunk@47607


git-svn-id: http://core.svn.wordpress.org/trunk@47382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-21 19:17:08 +00:00
Sergey Biryukov 6c243b4b0a Networks and Sites: Display the Site Address field on Add Site screen in left-to-right text direction.
Props ramiy.
Fixes #49949.
Built from https://develop.svn.wordpress.org/trunk@47606


git-svn-id: http://core.svn.wordpress.org/trunk@47381 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-21 11:26:07 +00:00
Sergey Biryukov b4373fafe9 Menus: Remove unused commented out code in `wp-admin/nav-menus.php`.
Props garrett-eclipse, audrasjb.
Fixes #49967.
Built from https://develop.svn.wordpress.org/trunk@47605


git-svn-id: http://core.svn.wordpress.org/trunk@47380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-21 09:02:08 +00:00
Sergey Biryukov 589666abc3 External Libraries: Revert [47603].
With the Docker image for PHP 7.4 updated to stable version, this should no longer be necessary.

See https://github.com/WordPress/wpdev-docker-images/pull/26

Props ocean90.
Fixes #49945.
Built from https://develop.svn.wordpress.org/trunk@47604


git-svn-id: http://core.svn.wordpress.org/trunk@47379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-20 15:41:08 +00:00
Sergey Biryukov e9e5d8e2b2 External Libraries: Comment out magic quote functions in getID3().
For some reason, the `version_compare()` check does not work as expected on Travis.

Follow-up to [46113], [47601].

See #49945.
Built from https://develop.svn.wordpress.org/trunk@47603


git-svn-id: http://core.svn.wordpress.org/trunk@47378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-20 12:12:06 +00:00
Sergey Biryukov 1bac2cbe66 External Libraries: Backport a commit from getID3() trunk to fix a PHP 7.4+ notice.
This addresses a "Trying to access array offset on value of type bool" notice in the `getid3_mp3::MPEGaudioHeaderValid()` method.

Props schlessera.
Fixes #49945.
Built from https://develop.svn.wordpress.org/trunk@47602


git-svn-id: http://core.svn.wordpress.org/trunk@47377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-20 11:34:07 +00:00
Sergey Biryukov 694bec2071 External Libraries: Update getID3() to 1.9.19.
Changelog: https://github.com/JamesHeinrich/getID3/compare/v1.9.18...v1.9.19

Props ayeshrajans, schlessera.
See #49945.
Built from https://develop.svn.wordpress.org/trunk@47601


git-svn-id: http://core.svn.wordpress.org/trunk@47376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-20 11:13:07 +00:00
Sergey Biryukov 71dea21c5f Users: Change "Your Profile" and "My Profile" links in admin menu and toolbar to just "Profile" for consistency.
Props donmhico, bcworkz, seanchayes, mikeschroder, garrett-eclipse, akhileshsabharwal, ScottSmith, nacin, jenmylo, afercia, swissspidy, felix-edelmann, helen, melchoyce, karmatosed.
Fixes #26769.
Built from https://develop.svn.wordpress.org/trunk@47600


git-svn-id: http://core.svn.wordpress.org/trunk@47375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-20 08:39:06 +00:00
Sergey Biryukov 30a35a4806 Upload: Better align file input and buttons in plugin/theme upload form.
Follow-up to [47271].

Props seedsca, piyushmca.
Fixes #49914.
Built from https://develop.svn.wordpress.org/trunk@47599


git-svn-id: http://core.svn.wordpress.org/trunk@47374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-19 09:47:08 +00:00
Sergey Biryukov ee387b9181 Accessibility: Widgets: Prevent checkboxes in widget control forms from overlapping on smaller screens.
Props jaz_on, milindmore22, passoniate, audrasjb, carriganvb, afercia, SergeyBiryukov.
Fixes #49228.
Built from https://develop.svn.wordpress.org/trunk@47598


git-svn-id: http://core.svn.wordpress.org/trunk@47373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-18 07:03:09 +00:00
Sergey Biryukov 61a2f62ffd Comments: Use `comment` instead of an empty string for the `comment_type` DB field value in comments table.
This is the first step to bring support for custom comment types into WordPress.

Add a scheduled upgrade routine to update the type value for existing comments, in batches of 100 at a time.

Props imath, aaroncampbell, jeremyfelt, dshanske.
Fixes #49236.
Built from https://develop.svn.wordpress.org/trunk@47597


git-svn-id: http://core.svn.wordpress.org/trunk@47372 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-17 19:35:06 +00:00
Sergey Biryukov 012b134b23 Coding Standards: Fix WPCS indentation issue in `wp-admin/nav-menus.php`.
This was causing a `PEAR.Functions.FunctionCallSignature.Indent` error if PHP_CodeSniffer 3.5.3 or newer is installed locally, despite the task passing on Travis.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-17 18:55:09 +00:00
Sergey Biryukov af1a737b48 Coding Standards: Fix WPCS indentation issue in `wp-admin/includes/class-wp-links-list-table.php`.
This was causing a `Generic.WhiteSpace.ScopeIndent.IncorrectExact` error if PHP_CodeSniffer 3.4.1 or newer is installed locally, despite the task passing on Travis.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-17 18:31:07 +00:00
ianbelanger cf9b35eccd Bundled Themes: Twenty Twenty fix typo in readme.txt.
Fixed TikTok was misspelled as Tik Tok in the readme.txt.

Props Asif2BD.
Fixes #49932.
Built from https://develop.svn.wordpress.org/trunk@47594


git-svn-id: http://core.svn.wordpress.org/trunk@47369 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-17 15:47:08 +00:00
Sergey Biryukov fc7561ce11 Coding Standards: Format the markup of widget forms in a more consistent manner.
See #49542.
Built from https://develop.svn.wordpress.org/trunk@47593


git-svn-id: http://core.svn.wordpress.org/trunk@47368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-17 09:38:07 +00:00
Sergey Biryukov 900cfc4816 Administration: Remove the smiley from overly happy "No activity yet!" message on Dashboard.
Props francoist, karmatosed, ibdz, estelaris, nrqsnchz, Presskopp.
Fixes #48387.
Built from https://develop.svn.wordpress.org/trunk@47592


git-svn-id: http://core.svn.wordpress.org/trunk@47367 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-17 07:57:10 +00:00
ianbelanger d9c2537d87 Bundled Themes: Twenty Nineteen center and right-aligned heading accents appear broken.
Fixes the center and right aligned heading accents so that they align with the text, instead of just staying left-aligned.

Props kjellr, melchoyce.
Fixes #49699.
Built from https://develop.svn.wordpress.org/trunk@47591


git-svn-id: http://core.svn.wordpress.org/trunk@47366 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-16 19:47:10 +00:00
ianbelanger c03b6040fe Bundled Themes: Twenty Twenty inline images in list blocks are not positioned correctly.
Fixes the alignment of inline images in list blocks to match the way they look in the editor.

Props poena, mayankmajeji, JavierCasares.
Fixes #49793.
Built from https://develop.svn.wordpress.org/trunk@47590


git-svn-id: http://core.svn.wordpress.org/trunk@47365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-16 19:38:07 +00:00
ianbelanger 5116ed9ebb Bundled Themes: Twenty Twenty add TikTok to the social icon menu.
This adds TikTok as an option in the social icon menu.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-16 19:01:09 +00:00
Sergey Biryukov 4fbfbf5f61 Plugins: Add HTML ID attributes to plugin action links for easier targeting in browser-based testing.
Props roytanck, shooper.
Fixes #49916.
Built from https://develop.svn.wordpress.org/trunk@47588


git-svn-id: http://core.svn.wordpress.org/trunk@47363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-16 17:02:08 +00:00
ianbelanger b2f072b97e Bundled Themes: Twenty Nineteen editor style interferes with navigation menu block.
Update editor styles to prepare for changes coming to the editor in 5.5. Currently the issue is only present when using the latest version of the Gutenberg plugin.

Props kjellr, Joen.
Fixes #49613.
Built from https://develop.svn.wordpress.org/trunk@47587


git-svn-id: http://core.svn.wordpress.org/trunk@47362 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-16 14:56:16 +00:00
ianbelanger 90f5e0576b Bundled Themes: Twenty Nineteen decrease the font size for widget titles.
Update styles to decrease the font size for widget titles.

Props kjellr, mukesh27.
Fixes #45865.
Built from https://develop.svn.wordpress.org/trunk@47586


git-svn-id: http://core.svn.wordpress.org/trunk@47361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-16 14:38:10 +00:00
Sergey Biryukov 92538d89ee Site Health: Detect an active PHP session as a possible reason for HTTP requests timing out.
PHP sessions created by a `session_start()` function call may interfere with REST API and loopback requests.

An active session should be closed by `session_write_close()` before making any HTTP requests.

Props matthieumota, netweblogic, Clorith, afragen, vjik, SergeyBiryukov.
Fixes #47320.
Built from https://develop.svn.wordpress.org/trunk@47585


git-svn-id: http://core.svn.wordpress.org/trunk@47360 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-16 08:20:09 +00:00
Sergey Biryukov 4e13efaf96 Code Modernization: Remove conditional use of `stream_get_contents()` PHP function.
The function was introduced in PHP 5.0.0. Now that the minimum version of PHP required by WordPress is 5.6.20, these conditions are no longer needed.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47359 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-15 11:54:08 +00:00
Sergey Biryukov bb2c0198ab Comments: Clarify that "Comment Moderation" and "Comment Blocklist" options in Discussion Settings also apply to browser's user agent string for submitted comments.
Props zodiac1978.
Fixes #49902.
Built from https://develop.svn.wordpress.org/trunk@47583


git-svn-id: http://core.svn.wordpress.org/trunk@47358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-15 06:40:05 +00:00
Dominik Schilling 2d04c2e5c8 Posts, Post Types: Pass the post object to the `before_delete_post`, `delete_post`, `deleted_post`, and `after_delete_post` actions.
Props jadpm.
Fixes #30940.
Built from https://develop.svn.wordpress.org/trunk@47582


git-svn-id: http://core.svn.wordpress.org/trunk@47357 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-14 19:26:07 +00:00
Sergey Biryukov a4f6f2beae Mail: Make the check for empty post title in `wp-mail.php` more resilient.
This addresses a regression in [47054], which caused posts sent via email to published with an empty title.

Props whyisjake, Otto42, MarkRH, MattyRob, mukesh27, afragen, pikamander2.
Fixes #49853.
Built from https://develop.svn.wordpress.org/trunk@47580


git-svn-id: http://core.svn.wordpress.org/trunk@47355 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-14 11:32:06 +00:00
Sergey Biryukov a21b8a91c6 Docs: Add a `@since` note for un-deprecated `category_link` and `tag_link` filters.
Follow-up to [47576].

See #49759.
Built from https://develop.svn.wordpress.org/trunk@47578


git-svn-id: http://core.svn.wordpress.org/trunk@47353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-14 08:15:19 +00:00
whyisjake 0a714eb26f Taxonomy: Un-depracate `category_link` and `tag_link` filters.
Depracating these filter might have been an accident, so let's restore.

Props SergeyBiryukov, audrasjb, peterwilsoncc.
Fixes #49759. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@47351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-14 00:33:09 +00:00
Sergey Biryukov ae59482c80 Plugins: Simplify the logic of `validate_plugin_requirements()`, update documentation.
This updates the function for consistency with `validate_theme_requirements()`.

Follow-up to [44978], [45546], [47573].

Fixes #43992.
Built from https://develop.svn.wordpress.org/trunk@47574


git-svn-id: http://core.svn.wordpress.org/trunk@47349 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-13 15:31:05 +00:00
Sergey Biryukov d341f20fb1 Themes: Block theme activation if it requires a higher version of PHP or WordPress.
Introduce `validate_theme_requirements()` for validating a theme's WordPress and PHP version requirements.

Follow-up to [44978] and [45546] for plugins.

Props afragen, audrasjb, SergeyBiryukov.
See #43992.
Built from https://develop.svn.wordpress.org/trunk@47573


git-svn-id: http://core.svn.wordpress.org/trunk@47348 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-13 15:28:11 +00:00
Sergey Biryukov 87b3b38242 Privacy: Add an indication when the Copy action in Privacy Policy Guide is complete.
This adds a "Copied!" text near the "Copy this section to clipboard" button to provide direct feedback that the action was completed.

Props garrett-eclipse, nickylimjj, xkon, desrosj, birgire.
Fixes #44588.
Built from https://develop.svn.wordpress.org/trunk@47572


git-svn-id: http://core.svn.wordpress.org/trunk@47347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-12 14:26:11 +00:00
Sergey Biryukov 48225beffb Rewrite Rules: Use double quotes instead of backticks in `.htaccess` instructions about `# BEGIN/END` markers.
Previously, the backticks resulted in extra markup being added when posted on support forums.

Props mayankmajeji, knutsp.
Fixes #49868.
Built from https://develop.svn.wordpress.org/trunk@47571


git-svn-id: http://core.svn.wordpress.org/trunk@47346 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-11 15:09:11 +00:00
Sergey Biryukov 9f379bb930 Docs: Fix typo in `WP_Upgrader::__construct()` DocBlock.
Props mattrad.
Fixes #49856.
Built from https://develop.svn.wordpress.org/trunk@47570


git-svn-id: http://core.svn.wordpress.org/trunk@47345 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-10 09:48:17 +00:00
whyisjake 92636d716a Site Health instantiation prevents use of some hooks by plugins.
As the WP_Site_Health class is instantiated prior to plugins being required and the `plugins_loaded` hook being fired, it prevents plugins from using the following hooks in the functions called by `maybe_create_scheduled_event()`.

Fixes #49824.
Props peterwilsoncc, whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@47343 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-10 03:57:08 +00:00
whyisjake e42f45e667 Customize: Give the WordPress logo a white background for dark mode browsers.
The favicon is transparent, which would normally look fine, but on a dark background it washes out.

Props DhrRob, audrasjb.
Fixes 49798.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47339 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-10 02:50:07 +00:00
whyisjake a1bf993892 Privacy: Support additional elements (table, ol, ul) in privacy policy guide new styling
The privacy policy guide supports a lot of HTML, include rules for lists, and ensure proper styling for the rest.

Props garrett-eclipse. 
Fixes #49772.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47335 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-09 22:34:05 +00:00