Commit Graph

22171 Commits

Author SHA1 Message Date
Aaron Jorbin 61c8b525b0 General: Backport polyfills for `str_ends_with()` and `str_starts_with()`.
Uses `src/wp-includes/functions.php` becouse commiting to `src/wp-includes/compat.php` fails due to the presence of `__autoload`.

Merges [52040], [56016], and [56015] to 4.6 branch.

Props ocean90, SergeyBiryukov, desrosj, joemcgill, jorbin, mukesh27.


Built from https://develop.svn.wordpress.org/branches/4.6@57450


git-svn-id: http://core.svn.wordpress.org/branches/4.6@56951 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2024-01-30 18:01:22 +00:00
Joe McGill b1bea70a2c WordPress 4.6.28.
Built from https://develop.svn.wordpress.org/branches/4.6@57420


git-svn-id: http://core.svn.wordpress.org/branches/4.6@56926 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2024-01-30 16:13:22 +00:00
audrasjb 27b938800e WordPress 4.6.27.
Built from https://develop.svn.wordpress.org/branches/4.6@56866


git-svn-id: http://core.svn.wordpress.org/branches/4.6@56377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-10-12 18:15:29 +00:00
davidbaumwald 69e59764eb Grouped backports to the 4.6 branch.
- Comments: Prevent users who can not see a post from seeing comments on it.
- Shortcodes: Restrict media shortcode ajax to certain type.
- REST API: Ensure no-cache headers are sent when methods are overridden.
- Prevent unintended behavior when certain objects are unserialized.

Merges [56834], [56835], [56836], and [56838] to the 4.6 branch.
Props xknown, jorbin, joehoyle, timothyblynjacobs, peterwilsoncc, ehtis, tykoted, antpb, rmccue.
Built from https://develop.svn.wordpress.org/branches/4.6@56859


git-svn-id: http://core.svn.wordpress.org/branches/4.6@56370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-10-12 18:10:52 +00:00
Sergey Biryukov 846b0a57b8 Grouped backports to the 4.6 branch.
- Media: Prevent CSRF setting attachment thumbnails.
- Embeds: Add protocol validation for WordPress Embed code.

Merges [55763] and [55764] to the 4.6 branch.
Props dd32, isabel_brison, martinkrcho, matveb, ocean90, paulkevan, peterwilsoncc, timothyblynjacobs, xknown, youknowriad.
Built from https://develop.svn.wordpress.org/branches/4.6@55783


git-svn-id: http://core.svn.wordpress.org/branches/4.6@55295 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-05-16 15:45:21 +00:00
Sergey Biryukov bf7dd76e5c WordPress 4.6.25.
Built from https://develop.svn.wordpress.org/branches/4.6@54590


git-svn-id: http://core.svn.wordpress.org/branches/4.6@54144 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-10-17 19:52:35 +00:00
Sergey Biryukov d0d858094b Grouped backports to the 4.6 branch.
- Posts, Post types: Apply KSES to post-by-email content,
- General: Validate host on "Are you sure?" screen,
- Posts, Post types: Remove emails from post-by-email logs,
- Pings/trackbacks: Apply KSES to all trackbacks,
- Comments: Apply kses when editing comments,
- Customize: Escape blogname option in underscores templates,
- Mail: Reset PHPMailer properties between use,
- Query: Validate relation in `WP_Date_Query`,
- Widgets: Escape RSS error messages for display.

Merges [54521], [54522], [54523], [54525], [54526], [54527], [54529], [54530], [54541] to the 4.6 branch.
Props voldemortensen, johnbillion, paulkevan, peterwilsoncc, xknown, dd32, audrasjb, martinkrcho, davidbaumwald, tykoted, johnjamesjacoby, ehtis, matveb, talldanwp.

Built from https://develop.svn.wordpress.org/branches/4.6@54561


git-svn-id: http://core.svn.wordpress.org/branches/4.6@54116 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-10-17 18:04:22 +00:00
desrosj b54a259fd6 WordPress 4.6.24.
Built from https://develop.svn.wordpress.org/branches/4.6@54001


git-svn-id: http://core.svn.wordpress.org/branches/4.6@53560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-08-30 17:36:43 +00:00
Sergey Biryukov 1ec0f7a2b8 Grouped backports to the 4.6 branch.
- Posts, Post Types: Escape output within `the_meta()`.
- General: Ensure bookmark query limits are numeric.
- Plugins: Escape output in error messages.

Merges [53958-53960] to the 4.6 branch.
Props tykoted, martinkrcho, xknown, dd32, peterwilsoncc, paulkevan, timothyblynjacobs.

Built from https://develop.svn.wordpress.org/branches/4.6@53977


git-svn-id: http://core.svn.wordpress.org/branches/4.6@53536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-08-30 15:48:21 +00:00
davidbaumwald aec4191751 WordPress 4.6.23.
Built from https://develop.svn.wordpress.org/branches/4.6@52886


git-svn-id: http://core.svn.wordpress.org/branches/4.6@52475 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-03-10 22:13:22 +00:00
Sergey Biryukov 5699e355e6 External Librairies: Update jQuery.query to version 2.2.3.
This updates the "jquery-query" library from version 2.1.7 to 2.2.3.

Props jorbin, peterwilsoncc, xknown, audrasjb, jorgefilipecosta.
Merges [52844] to the 4.6 branch.
Built from https://develop.svn.wordpress.org/branches/4.6@52860


git-svn-id: http://core.svn.wordpress.org/branches/4.6@52449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-03-10 21:33:21 +00:00
desrosj cb253d5b75 WordPress 4.6.22.
Built from https://develop.svn.wordpress.org/branches/4.6@52499


git-svn-id: http://core.svn.wordpress.org/branches/4.6@52091 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-01-06 18:55:22 +00:00
desrosj c3117156fd Grouped backports to the 4.6 branch.
- Query: Improve sanitization within `WP_Tax_Query`.
- Query: Improve sanitization within `WP_Meta_Query`.
- Upgrade/Install: Avoid using `unserialize()` unnecessarily.
- Formatting: Correctly encode ASCII characters in post slugs.

Merges [52454-52457] to the 4.6 branch.
Props vortfu, dd32, ehtis, zieladam, whyisjake, xknown, peterwilsoncc, desrosj, iandunn.
Built from https://develop.svn.wordpress.org/branches/4.6@52477


git-svn-id: http://core.svn.wordpress.org/branches/4.6@52069 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-01-06 18:18:21 +00:00
Peter Wilson 4f24d124ac WordPress 4.6.21.
Built from https://develop.svn.wordpress.org/branches/4.6@50880


git-svn-id: http://core.svn.wordpress.org/branches/4.6@50489 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-05-12 23:20:42 +00:00
Peter Wilson 155c2ad271 External libraries: Improve attachment handling in PHPMailer
Props: audrasjb, ayeshrajans, desrosj, peterwilsoncc, xknown.
Partially merges [50799] to the 4.6 branch.


Built from https://develop.svn.wordpress.org/branches/4.6@50858


git-svn-id: http://core.svn.wordpress.org/branches/4.6@50467 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-05-12 22:33:35 +00:00
desrosj 2a920d0912 Build/Test Tools: Backport GitHub Action and build improvements to the 4.6 branch.
This backports several build and test tool improvements to the 4.6 branch. Most notably, this includes:

- The changes required to allow each workflow to be triggered by the `workflow_dispatch` event so that tests can be run on a schedule [50590].
- Splitting single site and multisite tests into parallel jobs [50379].
- Split slow tests into separate, parallel jobs for PHP <= 5.6 [50444].
- Better branch and path scoping for GitHub Action workflows when running on `pull_request` [50432,50479].
- Several `devDependency` updates.

Merges [50379,50387,50416,50432,50435,50436,50444,50446,50473,50474,50476,50479,50485,50486,50487,50545,50579,50590] to the 4.6 branch.
See #50401, #51801, #51802, #52548, #52612, #52624, #52625, #52645, #52653, #52658, #52660, #52667.
Built from https://develop.svn.wordpress.org/branches/4.6@50637


git-svn-id: http://core.svn.wordpress.org/branches/4.6@50249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-02 15:34:24 +00:00
desrosj 0211c38565 Build/Test Tools: Support NodeJS 14.x in the 4.6 branch.
This updates the 4.6 branch to support the latest LTS version of NodeJS (currently 14.x), allowing the same version to be used across all WordPress branches that receive security updates as a courtesy.

This also replaces the `npm-shrinkwrap.json` with a `package-lock.json` file. Lock files were not supported in earlier versions of NPM, but can now be used.

In addition to backporting the package updates that happened after branching 4.6, dependencies that were removed in future releases have also been updated to their latest versions.

Props desrosj, dd32, netweb, jorbin.
Merges [42460-42461,42463,42887,43320,43323,43977,44219,44233,44728,45321,45765,46404,46408-46409,47404,47867-47869,47872-47873,48705,49636,49933,49937,49939,50017,50126,50176,50185] to the 4.6 branch.
See #52341.

Built from https://develop.svn.wordpress.org/branches/4.6@50206


git-svn-id: http://core.svn.wordpress.org/branches/4.6@49879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-02-05 04:17:44 +00:00
desrosj 1bacd1446a WordPress 4.6.20.
Built from https://develop.svn.wordpress.org/branches/4.6@49418


git-svn-id: http://core.svn.wordpress.org/branches/4.6@49177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-29 19:40:16 +00:00
whyisjake abc5355d75 General: WordPress updates
* XML-RPC: Improve error messages for unprivileged users.
* External Libraries: Disable deserialization in Requests_Utility_FilteredIterator
* Embeds: Disable embeds on deactivated Multisite sites.
* Coding standards: Modify escaping functions to avoid potential false positives.
* XML-RPC: Return error message if attachment ID is incorrect.
* Upgrade/install: Improve logic check when determining installation status.
* Meta: Sanitize meta key before checking protection status.
* Themes: Ensure that only privileged users can set a background image when a theme is using the deprecated custom background page.

Brings the changes from [49380,49382-49388] to the 4.6 branch.

Props xknown, zieladam, peterwilsoncc, whyisjake, desrosj, dd32.

Built from https://develop.svn.wordpress.org/branches/4.6@49400


git-svn-id: http://core.svn.wordpress.org/branches/4.6@49159 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-10-29 19:00:24 +00:00
desrosj d7a3ab3937 WordPress 4.6.19.
Built from https://develop.svn.wordpress.org/branches/4.6@47997


git-svn-id: http://core.svn.wordpress.org/branches/4.6@47765 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-10 21:38:12 +00:00
whyisjake fea2ba3cd6 General: Backport several commits for release.
- Embeds: Ensure that the title attribute is set correctly on embeds.
- Editor: Prevent HTML decoding on by setting the proper editor context.
- Formatting: Ensure that wp_validate_redirect() sanitizes a wider variety of characters.
- Themes: Ensure a broken theme name is returned properly.
- Administration: Add a new filter to extend set-screen-option.
Merges [47947-47951] to the 4.6 branch.
Props xknown, sstoqnov, vortfu, SergeyBiryukov, whyisjake.

Built from https://develop.svn.wordpress.org/branches/4.6@47974


git-svn-id: http://core.svn.wordpress.org/branches/4.6@47744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-10 18:55:16 +00:00
desrosj 1c099d1604 WordPress 4.6.18
Built from https://develop.svn.wordpress.org/branches/4.6@47674


git-svn-id: http://core.svn.wordpress.org/branches/4.6@47451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-29 18:02:05 +00:00
whyisjake e0fa795d49 Cache API: Ensure proper escaping around the stats method in the cache API.
Brings the changes in [47637] to the 4.6 branch.

Props: nickdaugherty, batmoo, whyisjake, westi.

Built from https://develop.svn.wordpress.org/branches/4.6@47655


git-svn-id: http://core.svn.wordpress.org/branches/4.6@47432 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-29 16:45:22 +00:00
whyisjake 6ebc722218 User: Invalidate `user_activation_key` on password update.
Query: Ensure that only a single post can be returned on date/time based queries.
Cache API: Ensure proper escaping around the stats method in the cache API.
Formatting: Expand `sanitize_file_name` to have better support for utf8 characters.

Brings the changes in [47634], [47635], [47637], and [47638] to the 4.6 branch.

Props: batmoo, ehti, nickdaugherty, peterwilsoncc, sergeybiryukov, sstoqnov, westi, whyisjake, whyisjake, xknown.


Built from https://develop.svn.wordpress.org/branches/4.6@47651


git-svn-id: http://core.svn.wordpress.org/branches/4.6@47426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-29 16:25:25 +00:00
Sergey Biryukov 5ca57c3ba6 WordPress 4.6.17
Built from https://develop.svn.wordpress.org/branches/4.6@46927


git-svn-id: http://core.svn.wordpress.org/branches/4.6@46727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-12 20:29:22 +00:00
Sergey Biryukov 138f753da7 Update `wp_kses_bad_protocol()` to recognize `&colon;` on uri attributes,
`wp_kses_bad_protocol()` makes sure to validate that uri attributes don’t contain invalid/or not allowed protocols. While this works fine in most cases, there’s a risk that by using the colon html5 named entity, one is able to bypass this function.

Brings r46895 to the 4.6 branch.

Props: xknown, nickdaugherty, peterwilsoncc.
Built from https://develop.svn.wordpress.org/branches/4.6@46914


git-svn-id: http://core.svn.wordpress.org/branches/4.6@46714 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-12 18:46:23 +00:00
desrosj 251c570d28 WordPress 4.6.16.
Built from https://develop.svn.wordpress.org/branches/4.6@46514


git-svn-id: http://core.svn.wordpress.org/branches/4.6@46311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-14 20:10:39 +00:00
whyisjake 51d665a4a5 Backporting several bug fixes.
- Query: Remove the static query property.
- HTTP API: Protect against hex interpretation.
- Filesystem API: Prevent directory travelersals when creating new folders.
- Administration: Ensure that admin referer nonce is valid.
- REST API: Send a Vary: Origin header on GET requests.

Backports [46474], [46475], [46476], [46477], [46478], [46483], [46485] to the 4.6 branch.

Built from https://develop.svn.wordpress.org/branches/4.6@46496


git-svn-id: http://core.svn.wordpress.org/branches/4.6@46293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-14 19:02:25 +00:00
desrosj c17ad2c252 WordPress 4.6.15.
Built from https://develop.svn.wordpress.org/branches/4.6@46040


git-svn-id: http://core.svn.wordpress.org/branches/4.6@45852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-04 22:04:44 +00:00
Andrew Ozz 94e8b0b76b jQuery: Backport the patch from jQuery 3.4.0.
Merges [45342] to the 4.6 branch.

Props MikeNGarrett, peterwilsoncc, azaozz.
Fixes #47020.
Built from https://develop.svn.wordpress.org/branches/4.6@46026


git-svn-id: http://core.svn.wordpress.org/branches/4.6@45836 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-04 21:48:30 +00:00
desrosj c33acf1903 Fix for URL sanitization in `wp_kses_bad_protocol_once()`.
Merges [45997] to the 4.6 branch.

Props irsdl, sstoqnov, whyisjake.
Built from https://develop.svn.wordpress.org/branches/4.6@46008


git-svn-id: http://core.svn.wordpress.org/branches/4.6@45819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-04 21:40:13 +00:00
Sergey Biryukov ef17e2b3b8 Improve handling the existing `rel` attribute in `wp_rel_nofollow_callback()`.
Merges [45990] to the 4.6 branch.
Props xknown, sstoqnov.
Built from https://develop.svn.wordpress.org/branches/4.6@45998


git-svn-id: http://core.svn.wordpress.org/branches/4.6@45809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-04 17:53:19 +00:00
Sergey Biryukov f08a1c1302 Improve URL validation in `wp_validate_redirect()`.
Merges [45971] to the 4.6 branch.
Props vortfu, whyisjake, peterwilsoncc.
Built from https://develop.svn.wordpress.org/branches/4.6@45978


git-svn-id: http://core.svn.wordpress.org/branches/4.6@45789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-04 17:12:24 +00:00
whyisjake ed63f9e30d Remove _convert_urlencoded_to_entities() from the get_the_content() callback.
Merges [45937] to the 4.6 branch.

Props vortfu, whyisjake, peterwilsoncc

Built from https://develop.svn.wordpress.org/branches/4.6@45956


git-svn-id: http://core.svn.wordpress.org/branches/4.6@45767 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-04 16:40:03 +00:00
Gary Pendergast 5db18ede70 WordPress 4.6.14
Built from https://develop.svn.wordpress.org/branches/4.6@44874


git-svn-id: http://core.svn.wordpress.org/branches/4.6@44705 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-13 01:18:21 +00:00
Sergey Biryukov 1ff333ca3b Comments: Improve comment content filtering.
Merges [44842] to the 4.6 branch.
Built from https://develop.svn.wordpress.org/branches/4.6@44848


git-svn-id: http://core.svn.wordpress.org/branches/4.6@44680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-12 22:37:22 +00:00
Sergey Biryukov f2daa0b4e6 Formatting: Improve `rel="nofollow"` handling in comments.
Merges [44833] to the 4.6 branch.
Built from https://develop.svn.wordpress.org/branches/4.6@44839


git-svn-id: http://core.svn.wordpress.org/branches/4.6@44671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-12 22:23:22 +00:00
Jeremy Felt c046ee1abd Bump 4.6 branch to version 4.6.13.
Built from https://develop.svn.wordpress.org/branches/4.6@44081


git-svn-id: http://core.svn.wordpress.org/branches/4.6@43911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-13 02:14:04 +00:00
Peter Wilson 41a7a8e581 Multisite: Validate activation links.
Merges [44048] to the 4.6 branch.

Built from https://develop.svn.wordpress.org/branches/4.6@44057


git-svn-id: http://core.svn.wordpress.org/branches/4.6@43887 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-13 01:42:20 +00:00
iandunn c54c0ddbf4 KSES: Make the URI attributes DRY.
This commit introduces the `wp_kses_uri_attributes` function and filter. The function centralizes the list of attributes, in order to prevent inconsistency, and the filter provides a way for plugins to customize the attributes.

Merges [44014] and [44017] to the `4.6` branch.

Built from https://develop.svn.wordpress.org/branches/4.6@44031


git-svn-id: http://core.svn.wordpress.org/branches/4.6@43861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-13 00:52:22 +00:00
Peter Wilson 8c5cdf2b39 Multisite: Improve messaging for previously activated users.
Ensure activation of a site is not attempted multiple times and users are shown the correct message if they follow the link a second time.

Merges [44021] to the 4.6 branch.

Built from https://develop.svn.wordpress.org/branches/4.6@44028


git-svn-id: http://core.svn.wordpress.org/branches/4.6@43858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-13 00:45:21 +00:00
Gary Pendergast 6e7503eedc KSES: Conditionally remove the `<form>` element from `$allowedposttags`.
To avoid backwards compatibility issues, `<form>` is re-added if a custom filter has added the `<input>` or `<select>` elements to `$allowedposttags`.

Merges [43994] to the 4.6 branch.

Built from https://develop.svn.wordpress.org/branches/4.6@44001


git-svn-id: http://core.svn.wordpress.org/branches/4.6@43833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-12 23:27:21 +00:00
Jeremy Felt bcbb4f7808 Media: Improve verification of MIME file types.
Merges [43988] to the 4.6 branch.

Built from https://develop.svn.wordpress.org/branches/4.6@43992


git-svn-id: http://core.svn.wordpress.org/branches/4.6@43824 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-12 23:08:22 +00:00
Aaron Campbell 4f99911c22 Bump 4.6 branch to version 4.6.12
Built from https://develop.svn.wordpress.org/branches/4.6@43410


git-svn-id: http://core.svn.wordpress.org/branches/4.6@43238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-07-05 16:12:07 +00:00
John Blackbourn c656a7d373 Media: Limit thumbnail file deletions to the same directory as the original file.
Merges [43393] to the 4.6 branch.

Built from https://develop.svn.wordpress.org/branches/4.6@43396


git-svn-id: http://core.svn.wordpress.org/branches/4.6@43224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-07-05 14:53:26 +00:00
Aaron Campbell 5798a9e9ae Bump 4.6 branch to version 4.6.11
Built from https://develop.svn.wordpress.org/branches/4.6@42936


git-svn-id: http://core.svn.wordpress.org/branches/4.6@42766 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-04-03 20:28:04 +00:00
Dominik Schilling 1a13b0102b Template: Make sure the version string is correctly escaped for use in attributes.
Merge of [42893] to the 4.6 branch.

Built from https://develop.svn.wordpress.org/branches/4.6@42920


git-svn-id: http://core.svn.wordpress.org/branches/4.6@42750 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-04-03 16:07:40 +00:00
Dominik Schilling c1af867a7c Meta: Simplify the delete all meta query in `delete_metadata()`.
Merge of [42913] to the 4.6 branch.

Built from https://develop.svn.wordpress.org/branches/4.6@42915


git-svn-id: http://core.svn.wordpress.org/branches/4.6@42745 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-04-03 15:42:32 +00:00
Dominik Schilling 5a4e8a9b94 HTTP: Don't treat `localhost` as same host by default.
Merge of [42894] to the 4.6 branch.

Built from https://develop.svn.wordpress.org/branches/4.6@42911


git-svn-id: http://core.svn.wordpress.org/branches/4.6@42741 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-04-03 15:37:22 +00:00
Dion Hulse daf7cc8b30 Bump the 4.6 branch to 4.6.10.
Built from https://develop.svn.wordpress.org/branches/4.6@42497


git-svn-id: http://core.svn.wordpress.org/branches/4.6@42326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-16 21:41:36 +00:00