Commit Graph

38310 Commits

Author SHA1 Message Date
Gary Pendergast
fa5cf0a7d6 Build Tools: grunt build should only copy Core files.
Historically, `grunt build` has copied all files from the `src` directory to the `build` directory. This is usually fine, but can be super slow when there are lots of custom plugins or themes in the `src` directory.

To rectify this, we now only copy Core plugins and themes to `build`.

Props adamsilverstein, pento, johnbillion.
Fixes #44256.


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


git-svn-id: http://core.svn.wordpress.org/trunk@43157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-06-28 02:22:36 +00:00
Sergey Biryukov
9115444ee7 Build/Test Tools: Replace Codex home page link in "Read more about setting up your local development environment" with a more specific handbook link.
Props abdullahramzan, johnbillion.
Fixes #44228.
Built from https://develop.svn.wordpress.org/trunk@43328


git-svn-id: http://core.svn.wordpress.org/trunk@43156 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-06-28 02:22:11 +00:00
Andrew Ozz
ab65b61da9 Build tools: Grunt:
- Normalize `filepath` in the the `watch` event.
- Throw a warning when `watch` fails to process a file because the destination path cannot be determined.

Fixes #44262.
Built from https://develop.svn.wordpress.org/trunk@43327


git-svn-id: http://core.svn.wordpress.org/trunk@43155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-06-28 02:21:45 +00:00
Jeremy Felt
3ab90ab858 Docs: Document globals in validate_another_blog_signup().
Props mukesh27.
Fixes #43594.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-06-28 02:21:21 +00:00
Sergey Biryukov
dde7843f7e Docs: Fix typo in Services_JSON DocBlocks.
Props sagarnasit.
Fixes #44244.
Built from https://develop.svn.wordpress.org/trunk@43325


git-svn-id: http://core.svn.wordpress.org/trunk@43153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-06-28 02:20:54 +00:00
Jeremy Felt
c3b788a205 Built/Test Tools: Increase grunt watch interval on all files.
Significantly reduces Grunt's CPU usage when `grunt watch` is in an idle/watching state.

Props netweb.
Fixes #44241.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-06-28 02:20:23 +00:00
Andrew Ozz
facf027fe7 Build tools: Update Grunt to version 1.0.2.
Props iandunn, netweb.
Fixes #42308.
Built from https://develop.svn.wordpress.org/trunk@43323


git-svn-id: http://core.svn.wordpress.org/trunk@43151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-06-28 02:19:59 +00:00
Andrew Ozz
87d1a3222b Build tools:
- Remove `check-node-version` from package.json for now. Throws errors.
- Minor fixes to package-lock.json, `http` => `https`.

See #44246.
Built from https://develop.svn.wordpress.org/trunk@43322


git-svn-id: http://core.svn.wordpress.org/trunk@43150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-06-28 02:19:33 +00:00
Andrew Ozz
6fd8080e7e Build tools: Use npm v6.1.0.
Props netweb.
Fixes #44245.
Built from https://develop.svn.wordpress.org/trunk@43320


git-svn-id: http://core.svn.wordpress.org/trunk@43149 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-27 16:01:23 +00:00
Sergey Biryukov
dd185824cd Docs: Fix typo in _walk_bookmarks() DocBlock.
Props abhijitrakas.
Fixes #44242.
Built from https://develop.svn.wordpress.org/trunk@43319


git-svn-id: http://core.svn.wordpress.org/trunk@43148 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-27 08:36:23 +00:00
Sergey Biryukov
0ff5536bac Posts, Post Types: Use COOKIEPATH when clearing post password cookie, as that's the path it's created with.
See #44089.
Built from https://develop.svn.wordpress.org/trunk@43318


git-svn-id: http://core.svn.wordpress.org/trunk@43147 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-27 01:33:22 +00:00
Sergey Biryukov
a724d77a4e Posts, Post Types: Clear post password cookie when logging out.
Props skoldin, subrataemfluence, ianbelanger, johnbillion.
Fixes #44089.
Built from https://develop.svn.wordpress.org/trunk@43317


git-svn-id: http://core.svn.wordpress.org/trunk@43146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-26 12:43:23 +00:00
John Blackbourn
e4b0a8d511 Build/Test Tools: Allow the unit test framework to be used without the data directory in place.
Fixes #43982
Built from https://develop.svn.wordpress.org/trunk@43315


git-svn-id: http://core.svn.wordpress.org/trunk@43144 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-25 22:43:26 +00:00
Boone Gorges
ecb4491670 Taxonomy: Improve cache handling when querying for terms using all_with_object_id.
When a term query using `fields=all_with_object_id` hits the cache, the
cached `stdClass` objects must be converted to `WP_Term` objects. This
was overlooked when `WP_Term_Query` was refactored to support object
queries in [38667].

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


git-svn-id: http://core.svn.wordpress.org/trunk@43142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-25 01:23:23 +00:00
Gary Pendergast
c5d5629471 Tools: Update wp-cli.yml to point to the build directory.
After [43309], WP-CLI should be running against the `build` directory, not the `src` directory.

Props jpry.
Fixes #44214.


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


git-svn-id: http://core.svn.wordpress.org/trunk@43141 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-25 00:15:23 +00:00
John Blackbourn
f57e182c87 Build/Test Tools: Roses are red, this fixes stuff.
Update the test infrastructure so that third party plugins, themes, and projects that use the core testing framework continue to operate from the `src` directory and do not require a build step.

Props mboynes, danielbachhuber, schlessera

See #43055

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


git-svn-id: http://core.svn.wordpress.org/trunk@43140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-23 17:55:22 +00:00
Gary Pendergast
54f004e184 Following [43309], I need to change one little line,
And delete some left over cruft, only then shall we prevail.
There are some things easily missed, when using Git, which does not persist—
Empty directories, though that didn't derail—
Our Travis-based tests, which now must prevail.
            Quoth Travis CI, “Build did fail.”

See #43055.


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


git-svn-id: http://core.svn.wordpress.org/trunk@43139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-23 11:03:24 +00:00
Gary Pendergast
922f83a69f Once upon a midnight dreary, while I coded, weak and weary,
In many a strange and curious file of forgotten lore—
While I pondered, blaming Nacin, my notifications suddenly awakened,
As of someone quietly DMing;—DMing me, I can’t ignore.
“’Tis some contributor,” I muttered, “DMing me an idea or four—
            Only this and nothing more.”

Ah, distinctly I remember, at WordCamp US, last December;
A mad proposal nearly laid me—down out cold—upon the floor.
Curious, I listened closely;—to a plan I agreed with, mostly—
A way to make our JavaScript—JavaScript which was a chore—
Maintainable, extendable, for the future, is what I saw.
            Guten-ready for evermore.

Open here I switch to Slack, when, with many a patch and hack,
In there stepped Omar, a JavaScript developer hardcore;
Pronouncing all the changes fit; ready now to be commit;
“There’s nothing else for us to do,” DMing me, “It’s done!” he swore—
“No longer random guessing at which file need next be explored—
            Let’s move on, we’re all aboard.”

Moved all together, grouped and managed, in folders all is packaged,
The code had all been cleaned and tidied, important parts moved to the fore,
“Though this change be useful here,” I said, “it is too large, I fear,
We couldn’t manage such a patch, we’ve done nothing like this before—
Tell me where doth go this change, change to make our codebase soar!”
            Quoth Omar, “In WordPress Core.”

Props omarreis for shepherding this significant change.
Props adamsilverstein, aduth, atimmer, dingo_bastard, frank-klein, gziolo, herregroen, jaswrks, jeremyfelt, jipmoors, jorbin, netweb, ocean90, pento, tjnowell, and youknowriad for testing, feedback, discussion, encouragement, commiserations, etc.
I make no apologies for this commit message.
Fixes #43055.


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


git-svn-id: http://core.svn.wordpress.org/trunk@43138 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-23 10:05:31 +00:00
Boone Gorges
2d62b67211 Taxonomy: Fix $object_ids reference in WP_Term_Query parameter documentation.
Props dlh.
Fixes #44200.
Built from https://develop.svn.wordpress.org/trunk@43308


git-svn-id: http://core.svn.wordpress.org/trunk@43137 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-23 02:24:21 +00:00
Sergey Biryukov
0caf5278c6 Docs: Escape the <!--nextpage--> page tag in wp_link_pages() and get_the_content() description for proper display in Developer Reference.
Props grapplerulrich.
See #42505.
Built from https://develop.svn.wordpress.org/trunk@43307


git-svn-id: http://core.svn.wordpress.org/trunk@43136 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-22 18:57:25 +00:00
Sergey Biryukov
a30e75437a Docs: Document the cookies default comment field added in [42772].
Props desrosj, chetan200891.
See #44125.
Built from https://develop.svn.wordpress.org/trunk@43304


git-svn-id: http://core.svn.wordpress.org/trunk@43133 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-21 13:13:21 +00:00
Sergey Biryukov
b4320bcd8f Docs: Add missing documentation and duplicate hook references for wp_privacy_personal_data_export_file, wp_privacy_personal_data_exporters, and wp_privacy_personal_data_erasers hooks.
Props birgire.
See #44125.
Built from https://develop.svn.wordpress.org/trunk@43303


git-svn-id: http://core.svn.wordpress.org/trunk@43132 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-21 13:03:21 +00:00
Sergey Biryukov
35f94eb211 Privacy: Correct the error check when creating an export folder in wp_privacy_generate_personal_data_export_file().
`wp_mkdir_p()` returns `false` on error, not a `WP_Error` object.

Props birgire.
Fixes #44158.
Built from https://develop.svn.wordpress.org/trunk@43299


git-svn-id: http://core.svn.wordpress.org/trunk@43128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-21 11:59:24 +00:00
laurelfulford
12737b798b Bundled Themes: Bump version numbers and update changelogs for 4.9.6 release
* Also, updates POT files for Twenty Ten and Twenty Eleven.

Props earnjam, laurelfulford.

Fixes #43915.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-17 17:07:22 +00:00
iandunn
00571b621c Tests: Add case for wp_privacy_delete_old_export_files().
Props allendav.
See #43546.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-17 16:39:22 +00:00
iandunn
da2f23fa23 Tests: Add case for wp_privacy_send_personal_data_export_email().
Props birgire.
See #43546.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-16 23:54:20 +00:00
iandunn
2754419731 Comments: Escape permalink values on edit screen to prevent XSS.
There doesn't appear to be any way for an attacker to introduce malicious input into the URL, unless a plugin is filtering the URL to add it, but it's better to be safe than sorry.

Props 1naveengiri, joyously.
Fixes #44115.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43119 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-16 22:39:21 +00:00
iandunn
461d17576c Privacy: Require manage_privacy_options to edit policy page.
A user is required to have the `manage_privacy_options` capability in order to determine which page is set as the privacy policy (the `wp_page_for_privacy_policy`). Given that, it doesn't make sense to allow users without that capability to edit or delete the page. 

A similar situation exists with the `page_for_posts` and `page_on_front` options, but Editors are allowed to edit those pages. The reason that this situation is different is because it is more likely that an administrator will want to restrict modifications to the privacy policy, than it is that they will want to allow modifications. Modifications to the policy often require specialized knowledge of local laws, and can have implications for compliance with those laws.

Props dlh, desrosj.
Fixes #44079.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-15 20:44:21 +00:00
iandunn
fdd5b8dacd Privacy: Rename exports folder to avoid deleting other files.
Previously, personal data exports were stored in `wp-content/uploads/exports`, which is generic enough that it's likely there are existing folders with that name, either created by plugins or manually by administrators. If that folder were reused by Core, then `wp_privacy_delete_old_export_files()` would delete all of the existing files inside it, which is almost certainly not what the site owner wants or expects.

To avoid that, the folder is being renamed to include a specific reference to Core, and a more verbose description of its purpose. With those factored in, it's very unlikely that there will be any conflicts with existing folders.

The `wp_privacy_exports_dir()` and `wp_privacy_exports_url()` functions were introduced to provide a canonical source for the location, and the `wp_privacy_exports_dir` and `wp_privacy_exports_url` filters were introduced to allow plugins to customize it.

Props johnjamesjacoby, allendav.
Fixes #44091.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43113 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-15 20:22:20 +00:00
Andrew Ozz
534f732104 Privacy: use the more compatible word-break: break-all;, see [43278].
See #44092.
Built from https://develop.svn.wordpress.org/trunk@43282


git-svn-id: http://core.svn.wordpress.org/trunk@43111 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-15 20:07:22 +00:00
Andrew Ozz
11ea5ebe0a Privacy: fix styling of the Privacy Settings buttons on mobile/small screens.
Props ianbelanger, azaozz.
Fixes #44093.
Built from https://develop.svn.wordpress.org/trunk@43279


git-svn-id: http://core.svn.wordpress.org/trunk@43108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-15 19:27:22 +00:00
Andrew Ozz
548f73cc7c Privacy: fix styling of the "next steps" buttons on the Export/Erase tools screens when text is long.
Props audrasjb, ianbelanger.
Fixes #44092.
Built from https://develop.svn.wordpress.org/trunk@43278


git-svn-id: http://core.svn.wordpress.org/trunk@43107 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-15 18:59:21 +00:00
Felix Arntz
dac5651f23 Widgets: Allow basic inline tags in wp_sidebar_description().
The customizer has allowed HTML in sidebar descriptions since adding support for sidebars. This change ensures that basic HTML is also allowed for them in the widgets admin screen.

Fixes #42608.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43104 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-15 16:55:21 +00:00
iandunn
3aaef96ff8 Privacy: Reposition log in policy link to avoid overlapping elements.
Previously, the link used absolute positioning, in order to stick it at the bottom of the page. That was done in order to create visual separation between it and the "action" links, like "Lost Your Password?"

The absolute positioning can cause conflicts in some situations, though. For example, if extra text or error notices are added above the form, then the login link would be positioned on top of other elements.

Switching to relative positioning with extra margins avoids those issues, while maintaining the visual separation between the "action" links and the privacy policy link.

Props imath, melchoyce, desrosj, xkon, iandunn.
Fixes #44046.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-15 16:27:24 +00:00
Andrew Ozz
8c06c2c662 Privacy: only remove the "Suggested text has changed" bubble when an admin visits the Privacy Policy Guide screen.
Fixes #44063.
Built from https://develop.svn.wordpress.org/trunk@43269


git-svn-id: http://core.svn.wordpress.org/trunk@43098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 17:52:21 +00:00
Andrew Ozz
2e9b08b3a2 Privacy: add wp_page_for_privacy_policy to populate_options().
Props ocean90.
Fixes #44076.
Built from https://develop.svn.wordpress.org/trunk@43267


git-svn-id: http://core.svn.wordpress.org/trunk@43096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 17:00:22 +00:00
Andrew Ozz
242e6eea46 Privacy: fix markup for the table of contents on privacy policy guide screen.
Props ocean90, azaozz.
Fixes #44056.
Built from https://develop.svn.wordpress.org/trunk@43265


git-svn-id: http://core.svn.wordpress.org/trunk@43094 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 16:46:23 +00:00
Andrew Ozz
b5564c8646 Privacy: fix the "Privacy Policy Guide updated" message and add a link to the guide.
Props birgire, azaozz.
Fixes #44057.
Built from https://develop.svn.wordpress.org/trunk@43263


git-svn-id: http://core.svn.wordpress.org/trunk@43092 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 16:21:21 +00:00
Dominik Schilling
2d4311e32e Privacy: Remove is-dismissible class from notice when privacy info has changed.
The notice isn't dismissible as it only gets removed once you visit the privacy guide, see #44057 and #44063.

Fixes #44065.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43090 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 15:55:21 +00:00
Dominik Schilling
d3b3cc3fa5 Privacy: Don't show privacy feature pointer to new users.
Fixes #44062.
Built from https://develop.svn.wordpress.org/trunk@43259


git-svn-id: http://core.svn.wordpress.org/trunk@43088 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 15:50:22 +00:00
John Blackbourn
810cbb537b Docs: Add missing HTTP methods to the list of those supported.
See #42505

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


git-svn-id: http://core.svn.wordpress.org/trunk@43087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 15:23:21 +00:00
Andrew Ozz
3ee58b55b1 Privacy: improve inline documentation.
Props desrosj.
Fixes #44075.
Built from https://develop.svn.wordpress.org/trunk@43256


git-svn-id: http://core.svn.wordpress.org/trunk@43085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 14:53:21 +00:00
Andrew Ozz
e765930982 Privacy: fix Export and Erase Personal Data list-tables on small screens.
Props ianbelanger, subrataemfluence, desrosj.
Fixes #44026.
Built from https://develop.svn.wordpress.org/trunk@43251


git-svn-id: http://core.svn.wordpress.org/trunk@43080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 09:21:21 +00:00
Andrew Ozz
cb084eefd8 Privacy: define $title and $parent_file in privacy.php. Fixes showing the proper document title.
Props ocean90.
Fixes #44064.
Built from https://develop.svn.wordpress.org/trunk@43250


git-svn-id: http://core.svn.wordpress.org/trunk@43079 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-14 08:29:22 +00:00
Andrew Ozz
a75b113bed Privacy: fix two typos in WP_Privacy_Policy_Content::get_default_content().
Props dlh.
Fixes #44050.
Built from https://develop.svn.wordpress.org/trunk@43249


git-svn-id: http://core.svn.wordpress.org/trunk@43078 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-13 11:15:21 +00:00
Andrew Ozz
b82fed1806 Privacy: require manage_privacy_options capability for showing WP_Privacy_Policy_Content::notice().
Props ocean90.
Fixes #44055.
Built from https://develop.svn.wordpress.org/trunk@43248


git-svn-id: http://core.svn.wordpress.org/trunk@43077 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-13 11:04:21 +00:00
Sergey Biryukov
9a390ea6bd Docs: Correct type for WP_Taxonomy::$cap.
Props dlh.
Fixes #44061.
Built from https://develop.svn.wordpress.org/trunk@43247


git-svn-id: http://core.svn.wordpress.org/trunk@43076 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-13 10:31:22 +00:00
iandunn
7f23a920d2 Privacy: Reposition pointer to ensure dismiss link is always visible.
r43158 introduced a new admin pointer for the privacy tools added in 4.9.6. With the previous positioning, though, sometimes the `Dismiss` link would be fixed off screen, making it impossible for the user to dismiss the pointer. This happened when there were enough extra menu items, or when the viewport height was short enough.

This commit repositions the pointer to work around that problem. One down side of this workaround is that the arrow will not always be positioned next to the `Tools` menu, where it should be. That's an acceptable compromise given the current time constraints, though. A long term solution would be to make `WP_Pointer` robust enough to handle this use case.

Props imath, audrasjb, desrosj.
Fixes #44045.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43075 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-12 17:29:21 +00:00
iandunn
fc800115a7 Privacy: Escape comment URLs in personal export file to prevent XSS.
There doesn't appear to be any way for an attacker to introduce malicious input into the URL, unless a plugin is filtering the URL to add it, but it's better to be safe than sorry.

Props birgire.
Fixes #44054.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43074 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-12 15:56:21 +00:00
Weston Ruter
89708c5cec Customize: Hide expansion arrows in Customizer's available widgets list.
Fixes regression introduced by [42794].

Props dlh.
See #40677.
Fixes #43983.

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


git-svn-id: http://core.svn.wordpress.org/trunk@43073 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-11 17:35:23 +00:00