Commit Graph

37811 Commits

Author SHA1 Message Date
Sergey Biryukov
7f190a310c Customize: Correct closing tags in customize_themes_print_templates().
Props johnpgreen, nandorsky.
Merges [42711] to the 4.9 branch.
Fixes #43307.
Built from https://develop.svn.wordpress.org/branches/4.9@42803


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42633 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-08 19:42:39 +00:00
Sergey Biryukov
d8da981665 Build/Test Tools: Update prefixed CSS properties in about.css.
Firefox 52+ supports unprefixed `column-count` and `column-gap` properties.

Props netweb, afercia.
Merges [42687] to the 4.9 branch.
Fixes #43190.
Built from https://develop.svn.wordpress.org/branches/4.9@42802


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-08 19:41:44 +00:00
Dion Hulse
3dd22cf28d Bump akismet external to 4.0.3.
See #43371


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-20 23:32:14 +00:00
Sergey Biryukov
8461e3a896 Media: Avoid a PHP warning in wp_calculate_image_srcset() if a plugin returns a non-array value via wp_calculate_image_srcset filter.
Props mrmadhat, codegrau.
Merges [42639] to the 4.9 branch.
Fixes #43201.
Built from https://develop.svn.wordpress.org/branches/4.9@42669


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-07 23:49:41 +00:00
Sergey Biryukov
1f26b2945d Post 4.9.4 version bump for 4.9 branch
Built from https://develop.svn.wordpress.org/branches/4.9@42668


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42496 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-07 23:19:42 +00:00
Dion Hulse
dd84717899 Bump the 4.9 branch to version 4.9.4.
Built from https://develop.svn.wordpress.org/branches/4.9@42656


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-06 15:42:43 +00:00
Dion Hulse
662345c10f Updates: Partially revert [42584], as this branch of code should always be run after a core update check.
This code branch is responsible for running all autoupdates, including plugins and themes - which should run regardless of if there's a core autoupdate available.

This revert does not revert the `$timeout` changes, as these should still use cached data if it's available.
Ideally this should be decoupled from the core update check to allow background updates to operate even when the core update check is disabled or running more often than twice daily.

Merges [42653] to the 4.9 branch.
Fixes #43103, #43235.

Built from https://develop.svn.wordpress.org/branches/4.9@42654


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-06 12:47:42 +00:00
Sergey Biryukov
2643287b2c Bump the 4.9 branch to version 4.9.3.
Built from https://develop.svn.wordpress.org/branches/4.9@42650


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42479 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-05 20:05:41 +00:00
Sergey Biryukov
8edf395b50 Post WordPress 4.9.3 RC 1 version bump.
Built from https://develop.svn.wordpress.org/branches/4.9@42629


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-01 00:56:41 +00:00
Sergey Biryukov
f709f56129 WordPress 4.9.3 RC 1.
Built from https://develop.svn.wordpress.org/branches/4.9@42628


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42457 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-01 00:43:41 +00:00
Sergey Biryukov
b7df04afe4 Media: avoid page scrolling when opening the media modal.
Moves focus to a proper element within the media modal to avoid the underlying
page to scroll to the bottom. Removes the media modal `freeze` option.

Props andreiglingeanu, adamsilverstein.
Merges [42624] to the 4.9 branch.
Fixes #39859.
Built from https://develop.svn.wordpress.org/branches/4.9@42627


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-31 23:55:41 +00:00
Sergey Biryukov
9201cc33cc Code Editor: Add Ctrl/Cmd+F as aliases for persistent search for more intuitive behaviour.
Keep Alt+F as well for users who already expect that.

Props Desertsnowman.
Merges [42625] to the 4.9 branch.
See #42586.
Built from https://develop.svn.wordpress.org/branches/4.9@42626


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42455 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-31 22:28:43 +00:00
Sergey Biryukov
dc9c4c4738 Customize: Ensure heartbeat keeps changeset locked when in branching mode.
Props dlh.
See #42024.
Merges [42612] to the 4.9 branch.
Fixes #42658.
Built from https://develop.svn.wordpress.org/branches/4.9@42623


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42452 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-30 15:24:41 +00:00
Sergey Biryukov
8d9813f6f6 Customize: Ensure media playlists get initialized after selective refresh; expose new wp.playlist.initialize() API.
In particular allows audio and video playlists to be added to the Text widget and previewed.

Props bpayton, westonruter.
See #40854.
Merges [42613], [42617] to the 4.9 branch.
Fixes #42495.
Built from https://develop.svn.wordpress.org/branches/4.9@42622


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-30 14:56:41 +00:00
Sergey Biryukov
a07ed5c926 Customize: Include nav menu item for Home custom link in search results for "Home".
Props audrasjb, westonruter.
Merges [42611] to the 4.9 branch.
Fixes #42991.
Built from https://develop.svn.wordpress.org/branches/4.9@42621


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42450 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-30 14:46:40 +00:00
Sergey Biryukov
a271c43cdb Customize: Ensure customize_autosaved requests only use revision of logged-in user.
Props dlh, westonruter.
See #42433, #39896.
Merges [42615] to the 4.9 branch.
Fixes #42450.
Built from https://develop.svn.wordpress.org/branches/4.9@42620


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-30 14:44:42 +00:00
Sergey Biryukov
d7291a5435 Post WordPress 4.9.3 Beta 1 version bump.
Built from https://develop.svn.wordpress.org/branches/4.9@42609


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 23:47:40 +00:00
Sergey Biryukov
ab139de982 WordPress 4.9.3 Beta 1.
Built from https://develop.svn.wordpress.org/branches/4.9@42608


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 23:38:41 +00:00
Sergey Biryukov
3798ce6757 Role/Capability: Make install_languages capability check less restrictive.
A user should still be able to have the capability, even when language packs cannot be automatically installed. The automatic installation part is separate from that now.

Props flixos90.
Merges [42606] to the 4.9 branch.
Fixes #42697.
Built from https://develop.svn.wordpress.org/branches/4.9@42607


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42436 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 22:59:38 +00:00
Sergey Biryukov
2c492ab774 Upgrade/Install: In postMessage events handler, check for message object existence before checking its action property.
Props manikmist09.
Merges [42604] to the 4.9 branch.
Fixes #43005.
Built from https://develop.svn.wordpress.org/branches/4.9@42605


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42434 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 22:32:38 +00:00
Sergey Biryukov
ff4c656579 Emoji: Update Emoji browser support tests for Twemoji v2.4.0
Really, following [42598].

Props peterwilsoncc.
Merges [42602] to the 4.9 branch.
Fixes #42862.
Built from https://develop.svn.wordpress.org/branches/4.9@42603


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42432 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 22:05:39 +00:00
Sergey Biryukov
09a5894a92 Emoji: Update Emoji browser support tests for Twemoji v2.4.0
Replaces the fairy (male) browser support test with a woman in business suit levitating. While the things that make people different sometimes become less obvious this isn't always a problem, because the things that make you strange are the things that make you powerful.

Props peterwilsoncc.
Merges [42598] to the 4.9 branch.
Fixes #42862.
Built from https://develop.svn.wordpress.org/branches/4.9@42601


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 21:55:40 +00:00
Sergey Biryukov
519f479887 Media: Fix JSHint error after [42595].
Merges [42599] to the 4.9 branch.
See #42646.
Built from https://develop.svn.wordpress.org/branches/4.9@42600


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42429 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 21:53:38 +00:00
Aaron Jorbin
f0fd88a7f5 Query: Fix warning on counting non countable
Merges [42581], [42585], and [42594] to the 4.9 branch.

Adds tests to continue the behavior for both null and strings. Skip the tests on PHP 5.2 as they require ReflectionMethod.

See https://wiki.php.net/rfc/counting_non_countables for information on the PHP change.

Fixes #42860.
Props dd32 for test skipping and janak007 and ayeshrajans for initial patches.

Built from https://develop.svn.wordpress.org/branches/4.9@42597


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 21:44:42 +00:00
Sergey Biryukov
4224f6e214 Media: Store and reuse image cropper ratio settings if available, instead of overwriting.
Props adamsilverstein.
Merges [42595] to the 4.9 branch.
Fixes #42646.
Built from https://develop.svn.wordpress.org/branches/4.9@42596


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 21:41:41 +00:00
Sergey Biryukov
f29bf78748 Tests: Update emoji base URL in Tests_Formatting_Emoji after [42590].
Merges [42592] to the 4.9 branch.
See #42862.
Built from https://develop.svn.wordpress.org/branches/4.9@42593


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 17:31:38 +00:00
Sergey Biryukov
4d2fabc973 Emoji: Update emoji base URL in _print_emoji_detection_script() and wp_staticize_emoji().
Merges [42590] to the 4.9 branch.
Props pento.
Fixes #42862.
Built from https://develop.svn.wordpress.org/branches/4.9@42591


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42420 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 16:54:38 +00:00
Gary Pendergast
3cc1a69391 Canonical URLs: Redirect to the correct URL when the post date changes.
When a post slug is changed, we store a copy of the old slug, so that we can redirect visitors visiting the old URL to the new URL.

In the same way, this stores a copy of the old date, when the post date changes, so we can redirect visitors to the new URL.

Merge of [42401,42587,42588] to the 4.9 branch.

Props nickmomrik, frank-klein.
Fixes #15397.


Built from https://develop.svn.wordpress.org/branches/4.9@42589


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42418 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 07:12:39 +00:00
Dion Hulse
366e0ada72 Updates: Only trigger Background Update processes from within the core update check when a core autoupdate is on offer.
This change reduces the number of API calls which WordPress makes to api.wordpress.org during release windows.

Previously the background updates would run upon every core update transient refresh, however now they'll only run if there's an update available.
The change also increases the cache period for plugin & theme checks when running via the cron, from never-cache to 2 hours, which should hopefully reduce the number of needless API calls.

Merges [42584] to the 4.9 branch.
Fixes #43103 for 4.9.

Built from https://develop.svn.wordpress.org/branches/4.9@42586


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42415 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 04:32:41 +00:00
Sergey Biryukov
723d0f2669 Media: Introduce a custom error handler for MediaElement.js to display a download link if a FLV file cannot be rendered for any reason.
Props Clorith.
Merges [42582] to the 4.9 branch.
Fixes #42643.
Built from https://develop.svn.wordpress.org/branches/4.9@42583


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 01:53:38 +00:00
Sergey Biryukov
5220bad266 Emoji: Update emoji regex for Twemoji to 2.4.0.
Build `src/wp-includes/formatting.php` following [42566].

Props peterwilsoncc.
Merges [42579] to the 4.9 branch.
Fixes #42862.
Built from https://develop.svn.wordpress.org/branches/4.9@42580


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42409 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 01:15:41 +00:00
Aaron Jorbin
4aee92bb1c REST API: Add existing term_id to the error data object when attempting to create a duplicate term.
Merges [42350] into 4.9

Props shooper, coleh, rachelbaker.
Fixes #42597. See #41370.

Built from https://develop.svn.wordpress.org/branches/4.9@42578


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 20:22:39 +00:00
Andrew Ozz
bbb8a324c7 Merged revision(s) 42576 from trunk:
TinyMCE: backport bug fixes to `NotificationManager` and `WindowManager` from d1877933fa (diff-2e5c98d81ce2481aa1042b2320728b65) and to `MultiRange` from 250675bb7b.

Props peterwilsoncc, azaozz.
Fixes #42722 for 4.9.3, see #43012.

Built from https://develop.svn.wordpress.org/branches/4.9@42577


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 19:41:42 +00:00
Andrew Ozz
bd00d61353 Merged revision 42574 from trunk:
Editor: when keeping the scroll position treat all shortcodes as preview-able. Otherwise in some cases the marker span can get stuck inside the shortcode and break the markup.

Props azaozz, lizkarkoski and othellobloke for testing.
Fixes #42908 for 4.9.3.

Built from https://develop.svn.wordpress.org/branches/4.9@42575


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 17:48:41 +00:00
Sergey Biryukov
124bdbb0cd Media: Restore white background of the content area in media modal.
Props afercia, chetan200891.
Merges [42572] to the 4.9 branch.
Fixes #43088.
Built from https://develop.svn.wordpress.org/branches/4.9@42573


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 14:03:42 +00:00
Sergey Biryukov
8662725a4b Email: Don't send notifications for site or network admin email address change to the default 'admin_email' value.
Props tigertech, MattyRob, seanchayes.
Merges [42570] to the 4.9 branch.
Fixes #42693.
Built from https://develop.svn.wordpress.org/branches/4.9@42571


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 13:47:40 +00:00
Sergey Biryukov
54194f2ec6 Customize: Correct "Add Items" button reference in help text shown after creating a new menu.
Props dlh, munyagu, rishishah.
Merges [42568] to the 4.9 branch.
Fixes #42565.
Built from https://develop.svn.wordpress.org/branches/4.9@42569


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 12:05:40 +00:00
Sergey Biryukov
83dc4c9339 Emoji: Update Twemoji to 2.4.0.
WordPress was already on 2.5.0, but Twemoji decided to break their versioning, so 2.4.0 is actually the latest release.

Merges [42566] to the 4.9 branch.
Fixes #42862.
Built from https://develop.svn.wordpress.org/branches/4.9@42567


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42396 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 11:51:41 +00:00
Sergey Biryukov
dd777e0e14 TinyMCE: on the toolbar drop-downs apply overflow style on the actual element with text.
Props abdullahramzan, azaozz.
Merges [42446] to the 4.9 branch.
Fixes #43090.
Built from https://develop.svn.wordpress.org/branches/4.9@42552


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42381 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 08:31:40 +00:00
Sergey Biryukov
98764508db Editor: change the test in user_can_richedit() to also detect when IE11 is in compatibility mode.
Props ndavison, azaozz.
Merges [42529] to the 4.9 branch.
Fixes #42503.
Built from https://develop.svn.wordpress.org/branches/4.9@42551


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 08:18:41 +00:00
Dion Hulse
906bc34226 WPDB: Use a PCRE syntax which supports PCRE compiled between 2003 and 2006.
This fixes a PHP Warning in `wpdb::parse_db_host()` when WordPress is used with (sometimes a modern) PHP that's compiled against an ancient PCRE version.

Merges [42549] to the 4.9 branch.
Fixes #43109 for 4.9.

Built from https://develop.svn.wordpress.org/branches/4.9@42550


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 03:40:42 +00:00
Aaron Jorbin
c4277abb33 Remove JSHint due to license compatibility
Backports [42547] without adding new files due to how minor updates work.

JSHint inherits a license from JSLint that includes the clause "The Software shall be used for Good, not Evil." WordPress's license specifically allows grants the freedom to run the program, for any purpose. Please note, this is not an encouragement of evil. Rather than doing something evil, how about learning to love those around you. Instead of tweeting lies and saying people are "Not Good!", help your neighbor. In the words of Lin Manual Miranda, "Love is love is love is love is love is love is love is love, cannot be killed or swept aside."

This replaces JSHint with esprima, a part of the larger jQuery project, and a custom wrapper for some basic error checking within codemirror.

The existing JSHint configuration is kept in place in case someone wants to use that, but they can only do so for Good.

Fixes #42850
Props netweb for a spelling fix on a comment.

Built from https://develop.svn.wordpress.org/branches/4.9@42548


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 03:38:41 +00:00
Weston Ruter
6ba9d07723 Widgets: Ensure media is explicitly enqueued from Text widget in case Media widgets are unregistered.
Amends [41344].
See #40854.
Fixes #43125 for 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42546


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-22 19:28:42 +00:00
Weston Ruter
db02fcb8f8 Customize: Let default status for Customizer be draft if user does not have capability to publish.
Amends [41626].
Props sayedwp, westonruter.
See #30937.
Fixes #42686 for 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42544


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-22 19:12:43 +00:00
Weston Ruter
385f70dc96 Customize: Prevent frontend previewing from causing a customization lock on the changeset.
Props dlh.
Amends [41839].
See #42024.
Fixes #42975 for 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42542


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-22 06:51:40 +00:00
Weston Ruter
54d1631126 Customize: Use changeset-specific "locked" messages when branching is enabled.
Props dlh.
See #39896.
Fixes #42655 for 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42539


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-22 06:32:41 +00:00
Weston Ruter
3ed6b9efd4 Customize: Prevent showing SFTP theme installation notification in multisite when user cannot install themes.
Props flixos90.
See #37661, #42184.
Fixes #42674 for 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42537


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42366 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-22 06:16:41 +00:00
Weston Ruter
2441c3c3f1 Customize: Improve accuracy of message displayed when accessing Customizer with a changeset that is already published or trashed.
Amends [38810].
Props dlh.
Fixes #42497 for 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42535


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-22 05:23:40 +00:00
Weston Ruter
2e8c881ff4 Widgets: Allow relative/partial URLs in Image Widget's link field.
Props audrasjb.
Amends [41252].
See #41274.
Fixes #42740 for 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42534


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-22 04:53:43 +00:00
Weston Ruter
0685e3e2f3 Code Editor: Disable attr-value-double-quotes HTMLHint rule since too strict for user input.
Using single-quoted attribute values is not in any way invalid HTML.

Amends [41376].
Props sasiddiqui.
See #12423.
Fixes #42802 for 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42532


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-21 08:04:43 +00:00