Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-12 21:54:17 +01:00
Code Issues Projects Releases Wiki Activity
37,764 Commits 50 Branches 748 Tags 792 MiB
652bc5d967
Commit Graph

16858 Commits

Author SHA1 Message Date
Sergey Biryukov
e0f0ee5de6 Users: Display partial names in the user listing tables. 
This allows showing a name when only the first or last name is provided.

Props shital-patel, antipole.
Merges [42256] and [42257] to the 4.9 branch.
Fixes #42713.
Built from https://develop.svn.wordpress.org/branches/4.9@42805


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42635 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-03-08 19:48:39 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Dion Hulse
0236fd226e Theme Editor: Translate the URL to the Child Themes Codex page. 
Props odysseygate, johnpgreen.
Merges [42247] to the 4.9 branch.
Fixes #42454.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42077 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-27 03:53:40 +00:00
Dion Hulse
9fe3e9edf0 Theme Editor: Validate files are editable based on their relative filenames, rather than full file path. 
This fixes theme editing on Windows platforms where `validate_file()` will return `2` on a full file path.

Merges [42244] to the 4.9 branch.
Fixes #42609.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42074 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-27 03:29:25 +00:00
Dion Hulse
e1095eeb9f Theme/Plugin Editor: Remove the caching added in [41806] as it causes more problems than it fixes. 
While caching here seemed like a good idea in theory, in practice the cache would be often stale causing development issues.
We exclude common folders (such as `node_modules`) from the scanning to avoid directories which are not useful to the end-user, so as long as those exclusion lists are held up this shouldn't cause too much of a degredation in the future.
We may consider adding caching here again in the future if it's determined that it is really needed.

Props precies, ibenic, mariovalney, schlessera, and all the others who commented on the ticket(s).
This partually reverts [41806].
Merges [42242] to the 4.9 branch.
See #6531.
Fixes #42573 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42072 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-27 03:00:38 +00:00
Dion Hulse
6dc1dd28f5 Themes: Prevent JS error on Themes admin screen when only one theme is installed. 
Amends [42029].
Props chetan200891, afercia.
See #42348, westonruter.
Merges [42222] to the 4.9 branch.
Fixes #42673.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-24 02:56:42 +00:00
John Blackbourn
97ba6be232 Docs: Correct the @since property for the page_attributes_misc_attributes action. 
Props jeremyescott, jfarthing84

Fixes #42607

Merges [42203] to the 4.9 branch.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42048 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-23 18:03:43 +00:00
Dion Hulse
cee7720939 Upgrade: Fix updating plugins which include a numeric file/folder names. 
The fix in [41821] caused numeric folder names to be reindexed to 0..n when in the root directory (for example, `my-plugin/24/`).

Props edo888.
See #41524.
Merges [42214] to the 4.9 branch.
Fixes #42628 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42044 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-21 04:16:41 +00:00
Dion Hulse
b09cebf575 Rewrite Rules: Correct the logic in extract_from_markers() after [41928]. 
Props stodorovic, SergeyBiryukov.
Merges [42199] to the 4.9 branch.
Fixes #42579. See #39920.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-21 03:47:38 +00:00
Dion Hulse
66a3d52431 Multisite: Fix broken update blog_versions query after [41661]. 
Props Mista-Flo, lenasterg, flixos90.
Merges [42210] to the 4.9 branch.
Fixes #42641.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42041 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-21 03:43:40 +00:00
Weston Ruter
a5f8e0917f Editor: Disable wp_keep_scroll_position in IE11 since buggy; fix matches polyfill conflict with ME.js by doing runtime feature detection in context window. 
Props westonruter, SergeyBiryukov, Clorith for testing.
See #41962, #42029.
Fixes #42553 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-15 19:00:38 +00:00
Weston Ruter
73615e0bc4 File Editor: Eliminate gap inserted between code editor and heading in IE11 when CodeMirror initializes. 
Props afercia, melchoyce, Clorith for testing, SergeyBiryukov for testing.
See #12423.
Fixes #42554 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42020 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-15 18:31:37 +00:00
Weston Ruter
567de560e9 Customize: Prevent themes panel from auto-expanding in IE11. 
In IE11 the `input` event erroneously gets triggered initially without any user input.

Amends [41648].
See #37661.
Fixes #42556 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-15 18:13:40 +00:00
Weston Ruter
ecf8680978 Editor: Improve scrolling behavior and prevent autosave logic from causing dirty state when just switching between Visual and Text tabs. 
Props pento.
See #41962, #42029.
Fixes #42530 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42014 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-15 00:22:42 +00:00
Weston Ruter
36282a2a9c About Page: Fix issue with overlapping images and text on IE11 and Edge 15. 
Props Clorith, ryelle, afercia, la-geek, SergeyBiryukov.
See #42087.
Fixes #42545 for 4.9

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42012 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-14 23:04:40 +00:00
Weston Ruter
0110751ddc Editor: Cease adding paragraphs when switching editor tabs. 
Fixes an error since [41783] in which extra paragraphs could be added to content when switching editor tabs.

Props pento, adamsilverstein, aduth.
Fixes #42531 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-14 05:28:41 +00:00
Gary Pendergast
5e736b62e0 Editor: When switching Editor tabs, don't scroll unnecessarily. 
- When switching to the Text view, wait until after the Visual editor element has been hidden, before focussing the `<textarea>`.
- When switching to the Visual view, only scroll if the cursor is not visible on the current screen.

Merge of 52175 to the 4.9 branch.

Fixes #42530.


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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-14 05:21:39 +00:00
Weston Ruter
eb18399c10 About: Fix jumping behavior for titles and columns when scrolling. 
Props ryelle.
See #42087.
Fixes #42514, #42526 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42004 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-13 22:48:36 +00:00
Weston Ruter
c268b2f28c Customize: Allow notifications for linting errors in code editor control (for Additional CSS) to be overridden to allow saving. 
Implements the same override that was implemented in [41721] for the theme/plugin editors.

See #41897, #41887.
Fixes #42528 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42002 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-13 22:47:12 +00:00
Weston Ruter
15b14c30c1 Customize: Prevent PHP notice on theme-switch dashboard welcome link (and link to themes admin screen) when user cannot customize. 
Props skostadinov, ocean90.
Amends [41699].
See #42050.
Fixes #42525 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-13 22:45:47 +00:00
Weston Ruter
11e007c502 About: Add vertical alignment for developer happiness sections. 
Also run CSS autoprefixer to add `-ms-` prefixes for CSS grid identifiers for IE11.

Props Presskopp.
Amends [42121].
See #42087.
Fixes #42524 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@41993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-13 05:49:36 +00:00
Weston Ruter
b0c557fbb2 About: Fix grammar typo with pluralization. 
Props metodiew, westonruter.
Amends [42121].
See #42087.
Fixes #42476 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@41991 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-13 05:20:36 +00:00
Weston Ruter
277261edeb About: Synchronize 4.9 tagline across about pages for credits, freedoms, and privacy. 
Props dave.pullig.
Amends [41943].
See #42087.
Fixes #42518 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@41989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-12 20:00:37 +00:00
Weston Ruter
1b39843b11 Theme Editor: Fix styling of child theme notice. 
Props westonruter, melchoyce, ndiego.
See #24048.
Fixes #42491 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@41987 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-11 20:44:38 +00:00
Weston Ruter
6cc5d01d17 Customize: Restore ability to add Custom Link nav menu items for jump links and other URLs that were previously allowed. 
Simplify regular expression for checking URL validity to just do basic checks to confirm the value looks like a URL. Leave the complete validation to the server-side logic in `WP_Customize_Nav_Menu_Item_Setting::sanitize()` to avoid having to maintain two separate codebases for validating URLs.

Props westonruter, SergeyBiryukov for testing.
Amends [41697].
See #32816.
Fixes #42506 for 4.9.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.9@41985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-11-10 23:43:39 +00:00