Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-24 10:09:47 +01:00
Code Issues Projects Releases Wiki Activity
41,027 Commits 50 Branches 749 Tags 806 MiB
5ddf97e142
Commit Graph

18088 Commits

Author SHA1 Message Date
Sergey Biryukov
5ddf97e142 Privacy: Give progress indication for export and erasure. 
This adds a progress indicator for "Download Personal Data" and "Erase Personal Data" row actions, which can take a while with a lot of data.

Props garrett-eclipse, allendav, dominic_ks, xkon, karmatosed, birgire.
Fixes #44264.
Built from https://develop.svn.wordpress.org/trunk@47246


git-svn-id: http://core.svn.wordpress.org/trunk@47046 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 20:19:05 +00:00
Sergey Biryukov
3342aafe5e Privacy: Rename wp_get_user_request_data() to wp_get_user_request() for clarity; deprecate the old function. 
The function returns an instance of the `WP_User_Request` object itself, not its `$request_data` property.

Follow-up to [44606].

Props garrett-eclipse.
Fixes #46302.
Built from https://develop.svn.wordpress.org/trunk@47245


git-svn-id: http://core.svn.wordpress.org/trunk@47045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 19:57:05 +00:00
jorgefilipecosta
76e375434b Block Editor: Backport inclusion of new editor settings to the core. 
This commit includes in the core settings for the gradients theme API stabilized in https://github.com/WordPress/gutenberg/pull/20107, and for the image sizes required for the latest posts feature image https://github.com/WordPress/gutenberg/pull/17151/.

Props: youknowriad, ryelle.
Fixes #49389.
Built from https://develop.svn.wordpress.org/trunk@47240


git-svn-id: http://core.svn.wordpress.org/trunk@47040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 17:52:15 +00:00
Sergey Biryukov
d98fe66044 Site Health: Move the warning about WP_DEBUG_LOG being publicly accessible from "critical issues" to "recommended improvements" if the error log is outside of the WordPress directory. 
Props afragen, Clorith, miss_jwo, mikeschroder, kubiq, xkon.
Fixes #47985.
Built from https://develop.svn.wordpress.org/trunk@47235


git-svn-id: http://core.svn.wordpress.org/trunk@47035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 05:16:07 +00:00
Sergey Biryukov
4f151b577e Administration: Standardize "found in Trash" messages. 
Props Presskopp, audrasjb.
Fixes #38669.
Built from https://develop.svn.wordpress.org/trunk@47234


git-svn-id: http://core.svn.wordpress.org/trunk@47034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 04:57:06 +00:00
Sergey Biryukov
a6949956d1 Administration: Capitalize Trash consistently in various messages and comments. 
When used as a noun referring to the "virtual" place, `Trash` should be capitalized.

Props garrett-eclipse, aandrewdixon, Presskopp.
Fixes #45317.
Built from https://develop.svn.wordpress.org/trunk@47233


git-svn-id: http://core.svn.wordpress.org/trunk@47033 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 04:12:07 +00:00
Sergey Biryukov
32edd58e4c Docs: Add descriptions for some globals: 
* `$wp_version`
* `$wp_local_package`
* `$required_php_version`
* `$required_mysql_version`

See #48303.
Built from https://develop.svn.wordpress.org/trunk@47230


git-svn-id: http://core.svn.wordpress.org/trunk@47030 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 03:30:06 +00:00
Andrew Ozz
e4f36258f9 Media: Ensure imgareaselect.js is not initialized twice for the same image. May happen when uploading an image into a post and then clicking on Edit Image. 
Fixes #49262.
Built from https://develop.svn.wordpress.org/trunk@47229


git-svn-id: http://core.svn.wordpress.org/trunk@47029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 02:54:05 +00:00
Sergey Biryukov
f13044b031 Editor: Add unique classes to .post-attributes-label-wrapper paragraphs for easier JS or CSS targeting. 
Props sathyapulse, sabernhardt, garrett-eclipse, noisysocks.
Fixes #44408.
Built from https://develop.svn.wordpress.org/trunk@47228


git-svn-id: http://core.svn.wordpress.org/trunk@47028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 02:29:06 +00:00
Sergey Biryukov
ddc8ddb294 Import: Remove "Blogroll" import option (for links in OPML format) from the list of popular importer plugins. 
Link Manager is disabled for new installations since WordPress 3.5, so core should not encourage importing links.

See #meta4706 for the corresponding WordPress.org API change.

Props Ipstenu, hareesh-pillai, DrewAPicture, nacin, karmatosed, dd32, garrett-eclipse.
Fixes #22994. See #21307.
Built from https://develop.svn.wordpress.org/trunk@47227


git-svn-id: http://core.svn.wordpress.org/trunk@47027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 02:12:06 +00:00
Sergey Biryukov
95edb66e53 Login and Registration: Use CSS animation instead of old JavaScript code for "shake" animation on login failure. 
Props markjaquith, valentinbora.
Fixes #48490.
Built from https://develop.svn.wordpress.org/trunk@47226


git-svn-id: http://core.svn.wordpress.org/trunk@47026 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-10 01:52:04 +00:00
joedolson
61ce35440c Editor: Fix incorrect usage of ID attributes on custom fields. 
Repeated containers used for custom fields have duplicate ID attributes. Duplicate IDs are incorrect HTML, and will also cause unexpected results when trying to manipulate using JS. Duplicate IDs are changed to matching classes; CSS & JS updated to match. 

Props jankimoradiya, audrasjb, donmhico, afercia.
Fixes #46964.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-09 19:41:07 +00:00
Sergey Biryukov
9429c8436d Coding Standards: Correct the get_plugin_page_hook() check in wp-admin/admin.php. 
The condition is meant to check for a non-empty string, however `get_plugin_page_hook()` can return null, in which case the strict check doesn't work as expected.

Follow-up to [47218].

See #48455, #49222.
Built from https://develop.svn.wordpress.org/trunk@47220


git-svn-id: http://core.svn.wordpress.org/trunk@47020 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-09 17:08:03 +00:00
Sergey Biryukov
641c632b0c Coding Standards: Use Yoda conditions where appropriate. 
See #49222.
Built from https://develop.svn.wordpress.org/trunk@47219


git-svn-id: http://core.svn.wordpress.org/trunk@47019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-09 16:55:09 +00:00
Sergey Biryukov
5e6c949861 Coding Standards: Use Yoda conditions in some wp-admin files. 
Props subrataemfluence, marcio-zebedeu, bookdude13, 1naveengiri, alishankhan.
Fixes #44365, #48455.
Built from https://develop.svn.wordpress.org/trunk@47218


git-svn-id: http://core.svn.wordpress.org/trunk@47018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-09 16:53:06 +00:00
Sergey Biryukov
e713bf9a88 Site Health: Only get MySQL server information in tests where it's actually needed. 
This resolves an issue with plugins like HyperDB, which doesn't have a database connection until a query is made.

Props xkon, Otto42, Clorith.
See #47606.
Built from https://develop.svn.wordpress.org/trunk@47215


git-svn-id: http://core.svn.wordpress.org/trunk@47015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-08 20:10:05 +00:00
Sergey Biryukov
01f133ee28 Accessibility: Menus: Make tab panels in Add menu items section more accessible for keyboard users. 
Props audrasjb, afercia.
Fixes #49211.
Built from https://develop.svn.wordpress.org/trunk@47209


git-svn-id: http://core.svn.wordpress.org/trunk@47009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-07 21:38:06 +00:00
Sergey Biryukov
052b8ebdbe Accessibility: Customize: Improve focus styles for color picker and media upload button in Customizer. 
Props audrasjb, timhavinga, afercia, karmatosed.
Fixes #48694.
Built from https://develop.svn.wordpress.org/trunk@47208


git-svn-id: http://core.svn.wordpress.org/trunk@47008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-07 21:11:05 +00:00
Sergey Biryukov
b2a1146380 Coding Standards: Adjust coding standards to always omit parentheses for include/require statements. 
These are language constructs, not function calls, so the parentheses are unnecessary.

This updates the PHPCS configuration file the enforce the sniff until it is moved from the `WordPress-Extra` ruleset to the `WordPress-Core` ruleset upstream.

Follow-up to [47198].

Props desrosj, jrf, GaryJ.
Fixes #49376.
Built from https://develop.svn.wordpress.org/trunk@47207


git-svn-id: http://core.svn.wordpress.org/trunk@47007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-07 19:16:06 +00:00
John Blackbourn
1f1fd617f5 Posts, Post Types: Add a parameter to the post_locked_dialog action which contains a reference to the user who holds the lock. 
Fixes #48443
Built from https://develop.svn.wordpress.org/trunk@47206


git-svn-id: http://core.svn.wordpress.org/trunk@47006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-07 17:53:06 +00:00
Andrew Ozz
aea25de893 Media: Add link to the original image in the image properties if it was scaled or rotated after uploading. 
Fixes #49290.
Built from https://develop.svn.wordpress.org/trunk@47202


git-svn-id: http://core.svn.wordpress.org/trunk@47002 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-07 05:13:05 +00:00
Sergey Biryukov
47ed56f38f Code Modernization: Replace dirname( __FILE__ ) calls with __DIR__ magic constant. 
This avoids the performance overhead of the function call every time `dirname( __FILE__ )` was used instead of `__DIR__`.

This commit also includes:

* Removing unnecessary parentheses from `include`/`require` statements. These are language constructs, not function calls.
* Replacing `include` statements for several files with `require_once`, for consistency:
 * `wp-admin/admin-header.php`
 * `wp-admin/admin-footer.php`
 * `wp-includes/version.php`

Props ayeshrajans, desrosj, valentinbora, jrf, joostdevalk, netweb.
Fixes #48082.
Built from https://develop.svn.wordpress.org/trunk@47198


git-svn-id: http://core.svn.wordpress.org/trunk@46998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-06 06:33:11 +00:00
Sergey Biryukov
9ed35cf902 Posts, Post Types: Change "Featured Image" post label to use sentence case: "Featured image". 
This makes it more consistent with other UI elements in the block editor.

Props mcsf.
Fixes #49371.
Built from https://develop.svn.wordpress.org/trunk@47194


git-svn-id: http://core.svn.wordpress.org/trunk@46994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-05 19:09:05 +00:00
Sergey Biryukov
0544629460 Posts, Post Types: Wrap text submitted via Quick Draft dashboard widget in the Paragraph block. 
Props audrasjb, jeroenrotty.
Fixes #48120.
Built from https://develop.svn.wordpress.org/trunk@47191


git-svn-id: http://core.svn.wordpress.org/trunk@46991 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-05 08:10:05 +00:00
Sergey Biryukov
44288356e2 Menus: Introduce wp_nav_menu_item_custom_fields action that fires just before the move buttons of a nav menu item in the menu editor. 
Props MikeSchinkel, birgire, sebastian.pisula, desrosj, helgatheviking.
Fixes #47056. See #38904, #18584.
Built from https://develop.svn.wordpress.org/trunk@47190


git-svn-id: http://core.svn.wordpress.org/trunk@46990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-05 07:43:05 +00:00
Sergey Biryukov
84c43d1863 Docs: Correct type for $item and $args parameters in Walker_Nav_Menu_Checklist and Walker_Nav_Menu_Edit to match the parent Walker_Nav_Menu` class. 
Follow-up to [38559], [45537].

See #24587, #48303.
Built from https://develop.svn.wordpress.org/trunk@47189


git-svn-id: http://core.svn.wordpress.org/trunk@46989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-05 07:25:05 +00:00
Sergey Biryukov
c32e05f308 Site Health: Improve focus style for accordion items on Site Health screens. 
The new style is more consistent with other elements like `.wp-core-ui` buttons.

Props audrasjb, mensmaximus, afercia, melchoyce, Clorith.
Fixes #48578.
Built from https://develop.svn.wordpress.org/trunk@47188


git-svn-id: http://core.svn.wordpress.org/trunk@46988 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-05 06:43:04 +00:00
Sergey Biryukov
be057c4a1c Users: In remove_user_from_blog(): 
* Change default value of the `$blog_id` parameter to match the documented type.
* Change the type of the `$reassign` parameter for consistency with `$user_id` and `$blog_id`.
* Add documentation for the return value.

See #49361.
Built from https://develop.svn.wordpress.org/trunk@47173


git-svn-id: http://core.svn.wordpress.org/trunk@46973 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-04 19:36:04 +00:00
Sergey Biryukov
8163215dc4 Plugins: Remove obsolete plugin_slugs transient from WP_Plugins_List_Table::prepare_items(). 
The transient is only used in the `wp_dashboard_plugins_output()` function, which is deprecated and unused since [40607].

The function itself also sets the same transient, so it can be removed from `WP_Plugins_List_Table`.

Props aftabmuni.
Fixes #49340.
Built from https://develop.svn.wordpress.org/trunk@47167


git-svn-id: http://core.svn.wordpress.org/trunk@46967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-02 15:50:04 +00:00
Sergey Biryukov
11fb46d4c6 Editor: Remove back-compat stub for Classic Editor's old distraction-free writing mode. 
The original script was deprecated in [30338] and removed in [32677].

Props Presskopp, ketuchetan.
Fixes #39448.
Built from https://develop.svn.wordpress.org/trunk@47164


git-svn-id: http://core.svn.wordpress.org/trunk@46964 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-02 04:15:03 +00:00
Sergey Biryukov
c94722d9bc Docs: Improve inline comments in wp-admin/options.php per the documentation standards. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47159


git-svn-id: http://core.svn.wordpress.org/trunk@46959 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-02 02:42:04 +00:00
Sergey Biryukov
a0f8b7003b Administration: Include options page name in the "Options page not found" error message to provide better context for plugin developers. 
Props tdlewis77, williampatton.
Fixes #42941.
Built from https://develop.svn.wordpress.org/trunk@47158


git-svn-id: http://core.svn.wordpress.org/trunk@46958 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-01 22:42:06 +00:00
Sergey Biryukov
8e37999368 Docs: Correct DocBlock formatting for register_setting(). 
Document the full list of whitelisted option key names.

See #48303.
Built from https://develop.svn.wordpress.org/trunk@47157


git-svn-id: http://core.svn.wordpress.org/trunk@46957 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-01 22:01:07 +00:00
Sergey Biryukov
deb1886078 Accessibility: Text Changes: Use sentence case for the word Error in various error messages, instead of all caps. 
Using all caps should be avoided for better readability and because screen readers may pronounce all-caps words as abbreviations.

Props afercia, ryokuhi, sabernhardt, garrett-eclipse.
See #47656, #43037, #42945.
Built from https://develop.svn.wordpress.org/trunk@47156


git-svn-id: http://core.svn.wordpress.org/trunk@46956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-01 21:38:04 +00:00
Sergey Biryukov
2fe7c95153 Text Changes: Capitalize error messages consistently. 
Props Presskopp.
Fixes #42945.
Built from https://develop.svn.wordpress.org/trunk@47154


git-svn-id: http://core.svn.wordpress.org/trunk@46954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-01 20:55:05 +00:00
Sergey Biryukov
12a6907123 Text Changes: Add missing periods to some error messages, for consistency. 
Props Presskopp.
Fixes #42735.
Built from https://develop.svn.wordpress.org/trunk@47153


git-svn-id: http://core.svn.wordpress.org/trunk@46953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-01 20:32:05 +00:00
Sergey Biryukov
21548ad0de Text Changes: Add missing periods to comment status update notices, for consistency. 
Props Presskopp.
See #42735.
Built from https://develop.svn.wordpress.org/trunk@47152


git-svn-id: http://core.svn.wordpress.org/trunk@46952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-01 20:29:05 +00:00
Sergey Biryukov
f65bc1401a Networks and Sites: Reduce max-width for user and site search inputs on Dashboard screen in Network Admin. 
This ensures that the inputs don't push the buttons to the next line.

Props williampatton, bordoni.
Fixes #49043.
Built from https://develop.svn.wordpress.org/trunk@47151


git-svn-id: http://core.svn.wordpress.org/trunk@46951 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-01 17:38:03 +00:00
Sergey Biryukov
06979c6597 Docs: Document the addition of $json_report_pathname parameter to the wp_privacy_personal_data_export_file_created action. 
Follow-up to [47146].

Props xkon.
Fixes #49029.
Built from https://develop.svn.wordpress.org/trunk@47150


git-svn-id: http://core.svn.wordpress.org/trunk@46950 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-01 04:17:05 +00:00
Sergey Biryukov
0aff1cf6bd Site Health: Rename WP_Site_Health::initialize() introduced in [47063] to ::get_instance(), for clarity and consistency with other core classes. 
Use `WP_Site_Health::get_instance()` where it's needed, instead of creating multiple instances of the class.

Props afercia, xkon, Clorith, SergeyBiryukov.
See #47606.
Built from https://develop.svn.wordpress.org/trunk@47149


git-svn-id: http://core.svn.wordpress.org/trunk@46949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-02-01 00:39:09 +00:00
Sergey Biryukov
3cd1514b91 Privacy: Clarify bulk action labels for personal data export and removal requests. 
Props garrett-eclipse, xkon, shariqkhan2012, websupporter, desrosj, JoshuaWold.
Fixes #44674.
Built from https://develop.svn.wordpress.org/trunk@47148


git-svn-id: http://core.svn.wordpress.org/trunk@46948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-31 03:43:05 +00:00
Sergey Biryukov
aef48b433b Accessibility: Privacy: Improve the readability of the suggested text in Privacy Policy Guide. 
Per WCAG 2.0 guidelines, big chunks of italic text should be avoided for better accessibility.

Props birgire, sabernhardt, xkon, garrett-eclipse, melchoyce, karmatosed, afercia, jepperask, SergeyBiryukov.
Fixes #44621. See #47327.
Built from https://develop.svn.wordpress.org/trunk@47147


git-svn-id: http://core.svn.wordpress.org/trunk@46947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-31 03:25:05 +00:00
Sergey Biryukov
39cef6947a Privacy: Introduce a JSON file into the personal data export. 
The produced ZIP archive will now include an `export.json` file along with the current `index.html`.

Props xkon.
Fixes #49029. See #46424.
Built from https://develop.svn.wordpress.org/trunk@47146


git-svn-id: http://core.svn.wordpress.org/trunk@46946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-31 01:36:05 +00:00
Sergey Biryukov
eafc40be6d Privacy: Remove user's email address from personal data export filename. 
Use `wp_unique_filename()` to avoid potential collisions instead.

Props xkon, garrett-eclipse, donmhico, Ov3rfly, Clorith, allendav.
Fixes #44197.
Built from https://develop.svn.wordpress.org/trunk@47144


git-svn-id: http://core.svn.wordpress.org/trunk@46944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-31 00:58:06 +00:00
Sergey Biryukov
4f67024da6 Administration: Add punctuation to "If you change this, we will send you an email" message on General Settings, Network Settings, and Profile screens. 
Props kinjaldalwadi, donmhico.
Fixes #49235.
Built from https://develop.svn.wordpress.org/trunk@47143


git-svn-id: http://core.svn.wordpress.org/trunk@46943 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-31 00:28:04 +00:00
Sergey Biryukov
d3c032bc35 Dashboard: Improve the appearance of "WordPress Events and News" dashboard widget for multi-day events. 
If an upcoming event spans over several days, this information is now properly reflected in the widget.

Props imath, casiepa, iandunn, hareesh-pillai, melchoyce, mapk, desrosj, audrasjb, SergeyBiryukov.
Fixes #47798.
Built from https://develop.svn.wordpress.org/trunk@47124


git-svn-id: http://core.svn.wordpress.org/trunk@46924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-29 02:19:08 +00:00
Sergey Biryukov
b2ffea836b Docs: Fix typos in wp-admin/includes/class-pclzip.php. 
With the upstream library not updated in 10 years since the last time it was merged, it should be safe to treat it as "adopted" rather than external, and make these fixes.

Props passoniate, ottok.
Fixes #49163. See #38464.
Built from https://develop.svn.wordpress.org/trunk@47123


git-svn-id: http://core.svn.wordpress.org/trunk@46923 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-29 00:56:04 +00:00
Sergey Biryukov
001ffe81fb Docs: Improve inline comments per the documentation standards. 
Includes minor code layout fixes for better readability.

See #48303.
Built from https://develop.svn.wordpress.org/trunk@47122


git-svn-id: http://core.svn.wordpress.org/trunk@46922 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-29 00:45:18 +00:00
Sergey Biryukov
395ee12145 Docs: Improve comments in js/_enqueues/wp/revisions.js per the documentation standards. 
Props passoniate.
Fixes #49177.
Built from https://develop.svn.wordpress.org/trunk@47120


git-svn-id: http://core.svn.wordpress.org/trunk@46920 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-29 00:37:04 +00:00
Sergey Biryukov
037a736757 Docs: Improve comments in some wp-admin files per the documentation standards. 
Follow-up to [47084].

Props passoniate, apedog.
Fixes #49223, #49227.
Built from https://develop.svn.wordpress.org/trunk@47119


git-svn-id: http://core.svn.wordpress.org/trunk@46919 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-29 00:35:08 +00:00