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
Sergey Biryukov
d9bf3e5e60
Plugins: Update review filter links in Details modal.
...
Props darko-a7, afercia.
Merges [42459] to the 4.9 branch.
Fixes #43016 . See #meta3379.
Built from https://develop.svn.wordpress.org/branches/4.9@42524
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-17 07:02:41 +00:00
Weston Ruter
4c4d1ecbe5
Widgets: Prevent `checkValidity` from running on a form when widget is first adding to sidebar.
...
Amends [41352].
See #23120 .
Fixes #43003 for 4.9 branch.
Built from https://develop.svn.wordpress.org/branches/4.9@42522
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-17 01:31:41 +00:00
Aaron Campbell
be9734cbee
Post 4.9.2 version bump for 4.9 branch
...
Built from https://develop.svn.wordpress.org/branches/4.9@42520
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42349 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-16 23:59:40 +00:00
Dion Hulse
4abf1b12c9
Bump the 4.9 branch to version 4.9.2.
...
Built from https://develop.svn.wordpress.org/branches/4.9@42494
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-16 21:37:40 +00:00
Sergey Biryukov
5e9186aaa5
Plugins: Fix the plugin details modal "Close" button after [42443].
...
Props rinkuyadav999.
Merges [42491] to the 4.9 branch.
Fixes #43082 .
Built from https://develop.svn.wordpress.org/branches/4.9@42493
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-16 20:58:43 +00:00
Dion Hulse
e77f8257ea
External Libraries: Remove unnecessary / obsoleted MediaElement.js files.
...
Props joemcgill.
Merges [42462] to the 4.9 branch.
Fixes #42720 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42465
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42294 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-16 06:41:51 +00:00
Sergey Biryukov
3bc41df4e4
Widgets: When checking for errors in Custom HTML widget, pass correct value to `toggleClass()` for Save button.
...
`toggleClass()` expects a boolean as a second argument, not an integer.
Props iCaleb.
Merges 42457 to the 4.9 branch.
Fixes #42867 .
Built from https://develop.svn.wordpress.org/branches/4.9@42458
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-15 23:51:38 +00:00
Sergey Biryukov
d72fbf753f
Plugins: Fix the plugin details modal in the install plugin search tab after [41356].
...
Props afercia.
Merges [42443] to the 4.9 branch.
Fixes #43082 .
Built from https://develop.svn.wordpress.org/branches/4.9@42456
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42285 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-15 23:07:41 +00:00
Sergey Biryukov
b6d9609fa9
WPDB: Always use `mysqli` when available.
...
This change makes WordPress use `mysqli` on PHP <5.5 when available, instead of only in PHP 5.5+ and development installs.
WPDB includes a fallback to `mysql` in the event that the database connection fails with `mysqli` so incompatibilities should be few and far between.
Props dd32.
Merges [42388] to the 4.9 branch.
Fixes #42812 .
Built from https://develop.svn.wordpress.org/branches/4.9@42455
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42284 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-15 22:50:39 +00:00
Sergey Biryukov
84bd75ea88
Media: Add `flac` to the list of allowed file types.
...
Props blobfolio.
Merges [42451] to the 4.9 branch.
Fixes #42225 .
Built from https://develop.svn.wordpress.org/branches/4.9@42452
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42282 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-15 22:24:41 +00:00
Sergey Biryukov
9026b41b3b
Media: Bring consistency to `getimagesize()` error suppression.
...
Props chasewg, joemcgill, jeremyfelt.
Merges [42449] to the 4.9 branch.
Fixes #42480 .
Built from https://develop.svn.wordpress.org/branches/4.9@42450
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42280 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-15 20:02:39 +00:00
Sergey Biryukov
77ce550e5c
Themes: Improve line wrapping in feature filter on Theme Install screen and in the Customizer.
...
Props chetan200891 for initial patch.
Merges [42447] to the 4.9 branch.
Fixes #42871 .
Built from https://develop.svn.wordpress.org/branches/4.9@42448
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42278 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-15 19:30:40 +00:00
Dion Hulse
3c9f3effb0
Formatting: Do not run formatting and texturization on author bios.
...
Removes the formatting and texturization added to author bios in #40040 due to back-compatibility concerns.
Reverts [41172], [41173].
Props 0x6f0, rabmalin for review, peterwilsoncc.
Merges [42441] to the 4.9 branch.
Fixes #42578 .
Built from https://develop.svn.wordpress.org/branches/4.9@42445
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42275 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-15 00:10:42 +00:00
Andrew Ozz
397b2de6e5
Merged revision 42430 from trunk:
...
Editor: ensure there is a selection before getting the caret position. Fixes a bug in Firefox when there is no selection for a hidden element.
Props johnschulz, azaozz.
Fixes #43012 for 4.9.2.
Built from https://develop.svn.wordpress.org/branches/4.9@42442
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-13 11:28:43 +00:00
Sergey Biryukov
b8ebacbf82
Editor: Link suggestions: add fallback title for posts with no title.
...
Props afercia.
Merges [42425] to the 4.9 branch.
Fixes #42664 .
Built from https://develop.svn.wordpress.org/branches/4.9@42439
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-12 20:13:38 +00:00
Sergey Biryukov
089aa052fb
Twenty Seventeen: Remove unnecessary comment in `front-page.php`.
...
Props hardik-amipara, poena.
Merges [42437] to the 4.9 branch.
Fixes #42820 .
Built from https://develop.svn.wordpress.org/branches/4.9@42438
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-12 20:09:41 +00:00
Sergey Biryukov
25dea6d03a
Customize: Prevent nav menu location assignment checkbox change from increasing height by 1px.
...
Props obenland.
Amends [41817].
Merges [42152] to the 4.9 branch.
See #42157 .
Fixes #42492 .
Built from https://develop.svn.wordpress.org/branches/4.9@42436
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-12 19:26:41 +00:00
Dion Hulse
5973b3a5e1
Upgrade: When deleting old files, if deletion fails attempt to empty the file instead.
...
Props joemcgill, dd32.
Merges [42433] to the 4.9 branch.
Fixes #42963 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42434
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-10 06:11:39 +00:00
Rachel Baker
a6e75ee0b7
General: Update copyright year to 2018 in license.txt.
...
Merges [42424] to the 4.9 branch.
Fixes #43007 .
Built from https://develop.svn.wordpress.org/branches/4.9@42428
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-06 19:32:42 +00:00
Rachel Baker
25bfff959f
REST API: Return the proper status code for failed permission callbacks in WP_REST_Server->dispatch().
...
Use the rest_authorization_required_code() function to return a 401 status code when a permission callback fails due to a user not being logged in.
Merges [42421] to the 4.9 branch.
Props jaswrks.
Fixes #42828 .
Built from https://develop.svn.wordpress.org/branches/4.9@42422
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42253 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-30 20:49:40 +00:00
Boone Gorges
af4f4f860e
Taxonomy: Restore deprecated argument to `term_description()` signature.
...
This ensures that the parameter can't be reused for something else
in the future.
Merges [42417] to the 4.9 branch.
Props jorbin.
Fixes #42605 .
Built from https://develop.svn.wordpress.org/branches/4.9@42418
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-22 02:50:39 +00:00
Dion Hulse
fadd733746
Bump akismet external to 4.0.2
...
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-18 23:58:23 +00:00
Weston Ruter
160e61fddf
Editor: Fix determining TinyMCE editor width when in inline mode instead of iframe mode.
...
See #40854 .
Amends [41985].
Props aduth.
Fixes #42416 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42391
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42220 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-13 05:19:40 +00:00
Konstantin Obenland
0a429ab309
Widgets: Always try restoring widget assignments
...
For code-historic reasons, restoring widget assignments would not be attempted if there were no sidebars to map.
Restoring previous assignments is something unrelated to sidebar mappings however, so now it will be attempted on every theme switch.
Fixes #42719 .
Merges [42374] to the 4.9 branch.
Built from https://develop.svn.wordpress.org/branches/4.9@42375
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42204 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-07 02:23:45 +00:00
Boone Gorges
030f429e78
`category_description()` should be taxonomy-agnostic.
...
This change reinstates the previous de facto behavior of `category_description()`.
See [40979], [42364]. Because `term_description()` no longer passes `$taxonomy` to
`get_term_field()`, the parameter is no longer needed and has been deprecated.
Merges [42368] to the 4.9 branch.
Fixes #42605 . See #42771 .
Built from https://develop.svn.wordpress.org/branches/4.9@42372
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-04 22:04:42 +00:00
Boone Gorges
c637f0c94f
`get_the_category_by_ID()` should be taxonomy-agnostic.
...
Prior to 4.9, this function was accidentally taxonomy-agnostic in most cases.
The fix in [40979] caused a regression in this function. For backward
compatibility, we make it explicit that the query is by ID only.
Merges [42367] to the 4.9 branch.
See #42771 .
Built from https://develop.svn.wordpress.org/branches/4.9@42371
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-04 22:00:41 +00:00
Boone Gorges
aedaea9209
Fix regression in `get_tag_link()` since 4.9.
...
See [42364] for description of the problem.
Because `get_category_link()` is now totally taxonomy-agnostic, `get_tag_link()`
can become a simple wrapper.
Merges [42366] to the 4.9 branch.
Props juiiee8487, markjaquith.
See #42771 .
Built from https://develop.svn.wordpress.org/branches/4.9@42370
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-04 21:58:42 +00:00
Boone Gorges
edb61cba2e
Don't do a strict taxonomy check in `get_category_link()`.
...
Prior to version 4.9, a quirk in the implementation of `get_term()` caused
`get_category_link( 123 )` to fetch the taxonomy archive link for term 123
even if 123 is not in the 'category' taxonomy. The quirk was fixed in [40979];
see #40671 . This bugfix introduced a regression for theme authors who were
expecting the old behavior.
By lifting the 'category' restriction, we allow the template function to work
in the old way.
Merges [42364], [42365] to the 4.9 branch.
Fixes #42717 . See #42771 .
Built from https://develop.svn.wordpress.org/branches/4.9@42369
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-04 21:55:40 +00:00
Konstantin Obenland
2afecbb253
Widgets: Don't try mapping empty sidebars.
...
Fixes a bug where the mapping logic would try mapping empty sidebars, resulting in PHP warnings.
Props ionvv, chetan200891 for initial patch.
See #42603 .
Merges [42362] to the 4.9 branch.
Built from https://develop.svn.wordpress.org/branches/4.9@42363
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-04 20:17:42 +00:00
Dion Hulse
1fdfabf74c
Avoid PHP Linting errors in the Random_Compat library under PHP7.
...
The latest updates to the library are larger than preferred, so instead this modifies the library to lint properly.
Fixes #42439 for 4.9
Built from https://develop.svn.wordpress.org/branches/4.9@42344
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-01 03:07:42 +00:00
John Blackbourn
c4a15959f5
Bump 4.9 branch to version 4.9.1.
...
Built from https://develop.svn.wordpress.org/branches/4.9@42316
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-29 18:55:42 +00:00
John Blackbourn
b4a3edc859
Hardening: Remove the ability to upload JavaScript files for users who do not have the `unfiltered_html` capability.
...
Merges [42261] to the 4.9 branch.
Built from https://develop.svn.wordpress.org/branches/4.9@42267
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-29 16:12:18 +00:00
John Blackbourn
e75247a179
Hardening: Ensure the attributes of enclosures are correctly escaped in RSS and Atom feeds.
...
Merges [42260] to the 4.9 branch.
Built from https://develop.svn.wordpress.org/branches/4.9@42266
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-29 16:11:38 +00:00
John Blackbourn
45874b5050
Hardening: Add escaping to the language attributes used on `html` elements.
...
Merges [42259] to the 4.9 branch.
Built from https://develop.svn.wordpress.org/branches/4.9@42265
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42094 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-29 16:10:41 +00:00
John Blackbourn
ecd15e008a
Hardening: Use a properly generated hash for the `newbloguser` key instead of a determinate substring.
...
Merges [42258] to the 4.9 branch.
Built from https://develop.svn.wordpress.org/branches/4.9@42264
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42093 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-29 16:08:41 +00:00
John Blackbourn
594456341d
Post WordPress 4.9.1 Beta 1 version bump.
...
Built from https://develop.svn.wordpress.org/branches/4.9@42254
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-28 18:12:38 +00:00
John Blackbourn
ec63674dfc
WordPress 4.9.1 Beta 1.
...
Built from https://develop.svn.wordpress.org/branches/4.9@42253
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42082 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-28 18:01:39 +00:00
John Blackbourn
4ae2ee9869
Media: Further improvements to the handling of language codes that get passed to MediaElement.
...
This change means that only the leading portion of a locale code gets passed to MediaElement, removing problems that arise from locales such as `de_DE_formal` and `pt_PT_ao90`.
Props erich_k4wp, blobfolio, flixos90, ocean90, joemcgill, SergeyBiryukov.
Fixes #42574
Merges [42251] to the 4.9 branch.
Built from https://develop.svn.wordpress.org/branches/4.9@42252
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-28 14:54:42 +00:00