Commit Graph

18779 Commits

Author SHA1 Message Date
Helen Hou-Sandí b456e9c9c8 Upgrade/Install: Consistent layout and accurate messages on the update screen.
* Clarifies that if you are on maintenance/security auto-updates that you are only on those and therefore there are more options available.
* Adds a message if a version control system has been detected, as automatic updates are disabled in that case.
* Ensures only one heading between `update available`, `you are on a dev version`, and `you are on latest` appears at any given time, falling back to `you are on latest` if something strange happens with the returned update data.
* Removes some older strings related to auto-updates, which greatly simplifies the above.
* Strips the `core-major-auto-updates-saved` query arg from the URL, as it is related to a dismissible notice.

Props audrasjb, pbiron, helen.
Fixes #51742.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-17 20:28:04 +00:00
Sergey Biryukov cf75a715c4 App Passwords: Regenerate the `.htaccess` file to add a new rule.
Application Passwords introduced a new Rewrite Rule to handle the Authorization header on certain systems.

This bumps the database version and updates the file so the change is applied to sites upon upgrading to 5.6.

Follow-up to [49534].

Props pbiron, TimothyBlynJacobs, SergeyBiryukov.
Fixes #51723.
Built from https://develop.svn.wordpress.org/trunk@49632


git-svn-id: http://core.svn.wordpress.org/trunk@49370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-17 17:24:06 +00:00
Sergey Biryukov f97647c207 Plugins: Make sure the HTML ID attributes for plugin checkboxes are unique.
Follow-up to [48374].

Props helen, sabernhardt, kishanjasani, mukesh27, hareesh-pillai.
Fixes #51256.
Built from https://develop.svn.wordpress.org/trunk@49631


git-svn-id: http://core.svn.wordpress.org/trunk@49369 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-17 16:48:09 +00:00
noisysocks 9f065de733 Customize: Temporary fix for autosave restore notice not being removed
Fixes the "There is a more recent autosave of your changes" notice from not
being removed when the dismiss button is clicked.

The problem is caused by the notice being initialized twice: once by the
`common` script and then again by the `customize-controls` script.

This temporary fix prevents `customize-controls` from initializing a notice if
it has already been initialized.

A better fix would be to not initialize notices twice. This can be done by
removing `common` as a dependency of `updates` when `deprecateL10nObject` is
removed.

When this happens (est: 5.7), this temporary fix should be reverted.

Fixes #51425.
See #51317.
Props karthikbhatb, dlh, SergeyBiryukov.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-17 04:45:11 +00:00
TimothyBlynJacobs d9b35c8e98 App Passwords: Unify availability language.
Previously App Passwords used a mix of "enabled" and "available". We've now standardized on using "available".

Additionally, we now use a 501 status code when indicating that App Passwords is not available.

Props SergeyBiryukov, ocean90, TimothyBlynJacobs.
Fixes #51513.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49355 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-16 22:42:04 +00:00
Helen Hou-Sandí aceaf33edd Multisite: More consistency for `clean_dirsize_cache()`.
Props SergeyBiryukov.
Fixes #19879.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49354 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-16 22:31:06 +00:00
Helen Hou-Sandí 14bd8cc469 Posts, Post Types: Go back to "Auto Draft" for CPTs without title support.
Reverts [49288] due to late point in 5.6 cycle and lack of update in Gutenberg package to account for the string change.
See #45516.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-16 19:44:07 +00:00
TimothyBlynJacobs 44125fc590 App Passwords: Include authorization rewrite rule in default multisite .htaccess
This rule was previously added to `WP_Rewrite`, but multisite uses a different .htaccess generation mechanism.

Props pbiron.
Fixes #51772.
See [49109].

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


git-svn-id: http://core.svn.wordpress.org/trunk@49345 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-15 17:46:06 +00:00
Sergey Biryukov df2644a14a Docs: Add missing descriptions for `_WP_List_Table_Compat` methods.
Props johannadevos, SaeedFard, swissspidy, desrosj, SergeyBiryukov.
Fixes #46842.
Built from https://develop.svn.wordpress.org/trunk@49599


git-svn-id: http://core.svn.wordpress.org/trunk@49337 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-14 16:54:08 +00:00
Sergey Biryukov 185607c417 Docs: Add missing descriptions for `Automatic_Upgrader_Skin` methods.
Props johannadevos, dilipbheda.
Fixes #44546.
Built from https://develop.svn.wordpress.org/trunk@49596


git-svn-id: http://core.svn.wordpress.org/trunk@49334 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-14 16:23:10 +00:00
Andrew Ozz d817ad9b55 Upgrade/Install: Ensure the current user can update core when saving the auto-update options.
See #51742.
Built from https://develop.svn.wordpress.org/trunk@49593


git-svn-id: http://core.svn.wordpress.org/trunk@49331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-13 16:57:13 +00:00
Sergey Biryukov 0bc22bb1fc Upgrade/Install: Account for the `automatic_updater_disabled` filter in core auto-update settings UI.
Follow-up to [49587].

Props markparnell, audrasjb.
See #51742.
Built from https://develop.svn.wordpress.org/trunk@49592


git-svn-id: http://core.svn.wordpress.org/trunk@49330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-13 11:14:08 +00:00
Sergey Biryukov d6a597efe2 I18N: Remove HTML tags from translatable strings on WordPress Updates screen.
Follow-up to [49587].

Props fierevere.
See #51742.
Built from https://develop.svn.wordpress.org/trunk@49591


git-svn-id: http://core.svn.wordpress.org/trunk@49329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-13 10:50:08 +00:00
Helen Hou-Sandí 582ca50733 Upgrade/Install: Better UI for auto-update settings on update screen.
This adds clearer messages about what your current settings mean for updates, uses a more compact link-based action instead of a checkbox to change the setting, and respects constants and filters.

Props audrasjb, karmatosed, helen, azaozz, hedgefield, marybaum.
Fixes #51742.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 22:37:10 +00:00
Sergey Biryukov c5257328b7 Customize: Exclude widget ID attributes from search.
Having search terms match the ID attributes leads to confusing results, specifically when the admin interface is set to a language other than English.

Follow-up to [27650].

Props afercia, dlh, noisysocks.
Fixes #46456.
Built from https://develop.svn.wordpress.org/trunk@49586


git-svn-id: http://core.svn.wordpress.org/trunk@49324 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 22:05:09 +00:00
Sergey Biryukov f2364f163b Administration: Make sure auto-update counts properly update when bulk deleting plugins or themes.
Props pbiron, noisysocks, desrosj, audrasjb, hellofromTonya.
Fixes #50870.
Built from https://develop.svn.wordpress.org/trunk@49582


git-svn-id: http://core.svn.wordpress.org/trunk@49320 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 20:42:10 +00:00
Helen Hou-Sandí d5fd3bd452 Upgrade/Install: Enable all core autoupdates for new installs.
Likely needs more work for multisite installs.

Reference: https://make.wordpress.org/core/2020/11/10/wp5-6-auto-update-implementation-change/

Props audrasjb, azaozz.
See #51743.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 20:22:09 +00:00
TimothyBlynJacobs 5ee48d6915 App Passwords: MOAR accessibility improvements.
Corrects the "Application Name" field's aria-describedby attribute and makes the description visible.

Props alexstine, SergeyBiryukov.
Fixes #51580.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 18:14:08 +00:00
Sergey Biryukov d772517fcc Database: Clean up the `post_category` column removed from DB schema for new installations in WordPress 2.8.
Its presence may conflict with `WP_Post::__get()`, which should generally fill the non-existent `post_category` property, but is not triggered if the column exists in the database.

Follow-up to [10895].

Props leogermani, davidbaumwald, hellofromTonya.
Fixes #51288.
Built from https://develop.svn.wordpress.org/trunk@49572


git-svn-id: http://core.svn.wordpress.org/trunk@49310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 17:55:11 +00:00
antpb 8efbef867c Media: Improve count in Media Library pagination.
Deleting all visible items on the last page of the media library previously left a blank page with no media items available. Using `wp_count_attachements` instead of `found_posts` solves the problem.

Props donsony, karmatosed, desrosj, mista-flo, justinahinon.

Fixes #39968.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49305 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 15:40:09 +00:00
Sergey Biryukov 3a1265e188 I18N: Add trailing punctuation to some translator comments.
Follow-up to [49549].

See #51580.
Built from https://develop.svn.wordpress.org/trunk@49562


git-svn-id: http://core.svn.wordpress.org/trunk@49300 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-11 10:41:07 +00:00
Sergey Biryukov 1f984603a2 Help/About: Add Site Health Status dashboard widget to the Help → Content tab.
Reorder the items in the help tab to align with their default position on the Dashboard screen.

Follow-up to [47063], [47300].

Props nlpro.
Fixes #51745.
Built from https://develop.svn.wordpress.org/trunk@49558


git-svn-id: http://core.svn.wordpress.org/trunk@49296 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-10 19:05:10 +00:00
antpb 64beb3ee49 Media: Removes duplicate alignment fix for browser uploader.
See #41648

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


git-svn-id: http://core.svn.wordpress.org/trunk@49293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 23:43:07 +00:00
antpb 4f2e88a574 Media: Adjusts alignment of file name text in browser uploader.
Sets a defined size for text alongside the media browser uploader button fixing alignment on popular browsers.

Props krupajnanda, mikeschroder, aaroncampbell, lucagrandicelli, andraganescu, samful, sabernhardt, andystitt829, kburgoine.
Fixes #41648

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


git-svn-id: http://core.svn.wordpress.org/trunk@49291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 23:34:09 +00:00
antpb 9901c9a48d Media: Adjust box-sizing for audio players.
Fix cropped container around playhead time in audio player.

Props ravipatel, sabernhardt, audrasjb, SergeyBiryukov, 
Fixes #51685

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


git-svn-id: http://core.svn.wordpress.org/trunk@49288 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 19:34:08 +00:00
TimothyBlynJacobs 74969e7fbe App Passwords: Further accessibility improvements.
- Add a label to the readonly password input.
- Handle focus loss after revoking app passwords.
- Handle focus loss after dismissing notices.
- Mark app name as `aria-required`.
- Use `aria-label` for detailed revoke button text instead of `title`.
- Use `-1` for `tabindex` instead of `0`.

Props alexstine, afercia, sabernhardt, audrasjb, joedolson, TimothyBlynJacobs.
Fixes #51580.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 18:05:08 +00:00
John Blackbourn 34765ddb64 Docs: Docblock corrections relating to `WP_Post` objects.
See #51373, #50768

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


git-svn-id: http://core.svn.wordpress.org/trunk@49282 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 15:15:08 +00:00
Sergey Biryukov a2d42351c5 Text Changes: Unify various "Back to..." vs. "Return to..." vs. "Go to..." strings.
Standardize on "Go to..." as a more appropriate option for most cases.

Props garrett-eclipse, kharisblank, audrasjb, ramiy, valentinbora.
Fixes #47235.
Built from https://develop.svn.wordpress.org/trunk@49539


git-svn-id: http://core.svn.wordpress.org/trunk@49277 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 10:53:10 +00:00
Sergey Biryukov 5683c46277 Site Health: Validate the test result data format in JS before using it.
This will discard any invalid responses instead of causing fatal errors.

It also makes badges optional, on the same basis as actions are optional. They are expected, but there may be situations where they are not present.

Props Clorith, dogwithblog, kraftbj, whyisjake, SergeyBiryukov.
Fixes #50145.
Built from https://develop.svn.wordpress.org/trunk@49537


git-svn-id: http://core.svn.wordpress.org/trunk@49275 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-08 09:52:10 +00:00
desrosj 5392af9208 Upgrade/Install: Change the notice displayed after saving auto-update settings to `.notice-success`.
This better conveys the message of the notice and brings consistency with other success notices throughout Core.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-03 17:55:06 +00:00
Sergey Biryukov a940c08357 Docs: Document the `$linkdata` parameter of `wp_insert_link()` using hash notation.
Props stevenlinx, peterwilsoncc.
Fixes #50853.
Built from https://develop.svn.wordpress.org/trunk@49487


git-svn-id: http://core.svn.wordpress.org/trunk@49246 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-03 03:52:10 +00:00
Helen Hou-Sandí a3581edd84 Upgrade/Install: Update help tab text to include major WordPress updates.
Props audrasjb.
Fixes #51653.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-02 20:16:06 +00:00
desrosj 6a39c891b2 Customize: Ensure menu items expand horizontally on large screens.
Props clorith, garrett-eclipse.
Fixes #51647.
Built from https://develop.svn.wordpress.org/trunk@49481


git-svn-id: http://core.svn.wordpress.org/trunk@49240 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-02 20:07:05 +00:00
Helen Hou-Sandí be95ec2c27 About: Optimize freedoms sprite and add 2 column layout.
Props garrett-eclipse, ryelle.
Fixes #46363.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-02 19:46:14 +00:00
desrosj e3a467a55a Upgrade/Install: Prevent removal of additional data from plugin update info.
This switches to using `wp_parse_args()` instead of a combination of `array_merge()` and `array_intersect_key()` when ensuring that all expected default keys are present in the update information for a plugin.

This prevents non-default data returned by 3rd-party plugins from being unintentionally stripped out.

Props peterwilsoncc, chriscct7.
Fixes #51609.
Built from https://develop.svn.wordpress.org/trunk@49477


git-svn-id: http://core.svn.wordpress.org/trunk@49236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-02 19:13:07 +00:00
Sergey Biryukov 89ce61835d Upgrade/Install: Switch "Check again" link on WordPress Updates screen to sentence case.
This brings some consistency with other text links on the screen, e.g. "View version details" for plugins or themes.

Follow-up to [49150].

Props afercia.
See #51523.
Built from https://develop.svn.wordpress.org/trunk@49471


git-svn-id: http://core.svn.wordpress.org/trunk@49230 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-02 01:17:09 +00:00
Adam Silverstein 25918dd10b Users: Password generation - restore "Cancel" aria label after r49248.
Restore the "Cancel" button aria label to "Cancel password change" after it was inadvertently changed in r49248.

Props SergeyBiryukov.
Fixes #42852.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-29 18:43:06 +00:00
desrosj 9c5173ffa6 Themes: Ensure that only privileged users can set a background image when a theme is using the deprecated custom background page.
Props xknown, zieladam, peterwilsoncc, whyisjake.
Merges [49379] to trunk.
Built from https://develop.svn.wordpress.org/trunk@49388


git-svn-id: http://core.svn.wordpress.org/trunk@49147 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-29 18:09:13 +00:00
desrosj 1050613168 Coding standards: Modify escaping functions to avoid potential false positives.
Props xknown, zieladam, peterwilsoncc.
Merges [49375] to trunk.
Built from https://develop.svn.wordpress.org/trunk@49384


git-svn-id: http://core.svn.wordpress.org/trunk@49143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-29 18:03:11 +00:00
Helen Hou-Sandí 9241624e6c Menus: Better responsive display for accordion items.
This only applies to the standalone menu screen; fixes for the customizer will be handled separately.

Props audrasjb, garrett-eclipse.
See #49375.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-27 20:18:06 +00:00
Sergey Biryukov a6db16fad0 Upgrade/Install: Adjust a string in `core_auto_updates_settings()` for consistency.
Props audrasjb, desrosj.
See #50907.
Built from https://develop.svn.wordpress.org/trunk@49345


git-svn-id: http://core.svn.wordpress.org/trunk@49105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-27 20:12:06 +00:00
Helen Hou-Sandí 7636806a52 Media: Fix styling for MediaElement player in media modal.
Fixes #43640.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-27 19:40:04 +00:00
Helen Hou-Sandí 85e954aa37 Login: Avoid AJAX error on login screen.
This has to do with the password generator, which does not need to generate and cache passwords in JS as that's already done in PHP.

Props adamsilverstein, sarahricker.
Fixes #51613.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-27 18:43:07 +00:00
TimothyBlynJacobs 2df94804d4 Site Health, App Passwords: Test if the Authorization header is populated correctly.
App Passwords rely on the Authorization header to transport the Basic Auth credentials. For Apache web servers, WordPress automatically includes a RewriteRule to populate the value for servers running in CGI or FastCGI that wouldn't ordinarily populate the value. 

This tests if the header is being filled with the expected values. For Apache users, we direct the user to visit the Permalinks settings to flush their permalinks. For all other users, we direct them to a help document on developer.wordpress.org.

Props Clorith, marybaum, TimothyBlynJacobs.
Fixes #51638.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-27 18:32:07 +00:00
Helen Hou-Sandí 219079f7a3 Privacy: Show failures before successes for all bulk actions.
Props garrett-eclipse.
See #44081, [49331].

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


git-svn-id: http://core.svn.wordpress.org/trunk@49094 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-27 18:19:06 +00:00
Helen Hou-Sandí f4f72498c0 Privacy: Show notices for both failed and successful bulk actions.
Props javorszky, garrett-eclipse, hellofromTonya.
Fixes #44081.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49092 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-27 17:47:08 +00:00
Andrew Ozz 7c32cbf990 Revert the improvenents to arranging of postboxes/metaboxes, [49179]. The current patch fixes about half a dozen problems, but seems more general improvements are needed to how Screen Options work.
See #50699.
Built from https://develop.svn.wordpress.org/trunk@49325


git-svn-id: http://core.svn.wordpress.org/trunk@49086 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-27 10:47:12 +00:00
Sergey Biryukov 18ee84c5c2 Customize: Ensure the New Menu section is properly rendered.
Follow-up to [30102], [49101].

Props david.binda, boldgrid, dlh, azaozz, Clorith, westonruter, hellofromTonya.
Fixes #51592.
Built from https://develop.svn.wordpress.org/trunk@49323


git-svn-id: http://core.svn.wordpress.org/trunk@49084 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-27 02:48:06 +00:00
Sergey Biryukov 0fb5ccd4d0 Docs: Add a `@global` tag for `$user_id` in `WP_Application_Passwords_List_Table::prepare_items()`.
Props mukesh27.
Fixes #51633.
Built from https://develop.svn.wordpress.org/trunk@49321


git-svn-id: http://core.svn.wordpress.org/trunk@49082 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-27 02:12:06 +00:00
Helen Hou-Sandí 8b3071bc1a Administration: Accommodate long translations for "Posts" in list table headers.
This stems from longer translations on the User table, but this will apply to any posts column in a list table. Hyphenation should typically just apply to the column header, as the cell contents are just a count.

This does appear to have some browser inconsistencies, so may need further adjustment in the future.

Props audrasjb, justinahinon.
Fixes #50838.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49079 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-26 23:16:05 +00:00