Commit Graph

34570 Commits

Author SHA1 Message Date
Weston Ruter
fed5a03c8f Customize: Prevent image controls with selected images smaller than pane width from being distorted through stretching to fit width.
Props celloexpressions.
Fixes #37277.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 21:45:28 +00:00
Sergey Biryukov
83cd70a5f6 Text Changes: Remove duplicate string, use the one we already have.
See #34521.
Built from https://develop.svn.wordpress.org/trunk@37956


git-svn-id: http://core.svn.wordpress.org/trunk@37897 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 21:37:27 +00:00
Dominik Schilling
6f33a94487 Customize: Use the correct variable when referring to the media frame.
Props celloexpressions.
Fixes #36236.
Built from https://develop.svn.wordpress.org/trunk@37955


git-svn-id: http://core.svn.wordpress.org/trunk@37896 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 20:45:28 +00:00
Dominik Schilling
54c92d656f Unit Tests: Change some @group annotations to @ticket.
Built from https://develop.svn.wordpress.org/trunk@37954


git-svn-id: http://core.svn.wordpress.org/trunk@37895 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 20:25:27 +00:00
Dominik Schilling
be54af2e4c Nav Menus: In Walker_Nav_Menu_Edit::start_el() initialize $original_title with false.
Prevents displaying "Original:" without a title when adding a menu item without a title.

Props grapplerulrich, swissspidy.
Fixes #36729.
Built from https://develop.svn.wordpress.org/trunk@37953


git-svn-id: http://core.svn.wordpress.org/trunk@37894 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 20:16:28 +00:00
Sergey Biryukov
e64b88cb34 Media: Avoid PHP notices when trying to show a parent post title of an orphaned post type.
Props littler.chicken.
See #37186.
Built from https://develop.svn.wordpress.org/trunk@37952


git-svn-id: http://core.svn.wordpress.org/trunk@37893 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 19:34:28 +00:00
Dominik Schilling
a7bbdb23cc Unit Tests: Remove @group foo annotation from Tests_WP_Resource_Hints::test_dns_prefetch_styles().
Built from https://develop.svn.wordpress.org/trunk@37951


git-svn-id: http://core.svn.wordpress.org/trunk@37892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 19:29:27 +00:00
Dominik Schilling
c95e87bd34 Unit Tests: Remove an unused parameter from Tests_Ajax_DimComment::test_with_bad_id().
Prevents a "too few arguments" error in PHP 7.1.0.

Fixes #37271.
Built from https://develop.svn.wordpress.org/trunk@37950


git-svn-id: http://core.svn.wordpress.org/trunk@37891 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 19:08:28 +00:00
Sergey Biryukov
6edb48dd57 Docs: In wp_list_authors(), clarify that include and exclude arguments can also be an array.
Fix duplicated `exclude` argument description.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 14:34:27 +00:00
Sergey Biryukov
caa11e403d I18N: Make the translator comment added in [37858] more explicit and consistent with other similar instances.
See #37147.
Built from https://develop.svn.wordpress.org/trunk@37948


git-svn-id: http://core.svn.wordpress.org/trunk@37889 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 13:10:30 +00:00
Dominik Schilling
1d13c64927 Themes: After [37287], remove deprecated feature category.
See #33407.
Built from https://develop.svn.wordpress.org/trunk@37947


git-svn-id: http://core.svn.wordpress.org/trunk@37888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 10:01:28 +00:00
Dominik Schilling
720106e16d Themes: After [37287], add deprecated theme features to the tag list in WP_Theme::translate_header().
Themes which are not yet updated can still have the old tags. This makes sure that these tags are still translated.

See #33407.
Built from https://develop.svn.wordpress.org/trunk@37946


git-svn-id: http://core.svn.wordpress.org/trunk@37887 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 09:58:28 +00:00
Dominik Schilling
b733aa79ab Themes: Add "Custom Logo" to the list of WordPress theme features.
Props rabmalin.
See #33407.
Fixes #36744.
Built from https://develop.svn.wordpress.org/trunk@37945


git-svn-id: http://core.svn.wordpress.org/trunk@37886 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 09:35:27 +00:00
Gary Pendergast
2d6b9ca91b General: Remove the Pragma header from responses.
`Pragma` is supposed to be a request header, but we've been including it in responses since the beginning of time.

This is a relic dating all the way back to b2, probably originally added because Internet Explorer version 5 and earlier didn't understand the `Cache-Control` header in responses, but they did (incorrectly) obey the `Pragma` header.

Internet Explorer 6 and 7 will obey the `Pragma` response header only if no other cache-related response headers are present (in our case, they are always present), and all other browsers ignore the `Pragma` response header.

Props geekysoft.
Fixes #37250.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 04:02:31 +00:00
Rachel Baker
e5fcbb3514 REST API: Reverse order of setting sanitization/validation, validating prior to sanitizing.
Fixes mistake in the current behavior, where the sanitization callback ran before the validation callback. Now the validation callback will run before the sanitization.

Props schlessera, rachelbaker.
See #37247.
Fixes #37192.



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


git-svn-id: http://core.svn.wordpress.org/trunk@37884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-02 23:03:27 +00:00
Weston Ruter
318fec4dcd Customize: Reverse order of setting sanitization/validation, validating prior to sanitizing.
Reverses order where sanitization was being applied before validation originally in accordance with REST API logic.

Props westonruter, schlessera.
See #34893.
See #37192.
Fixes #37247.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37883 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-02 18:39:30 +00:00
Helen Hou-Sandí
20b329ba08 Media: Only show parent post titles when the user can read said post.
fixes #37186.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37882 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-01 15:07:36 +00:00
Peter Wilson
26c07ed8d9 Users: Check zxcvbn is defined before calling.
Prevents JavaScript errors by checking zxcvbn is defined before calling.

Changes `wp.passwordStrength.meter()` to return `-1` if the strength of the password is unknown.

On the user profile screen, `generatePassword()` checks if the user has entered the password before setting the value of the password input box.

Props peterwilsoncc, adamsilverstein.
Fixes #34905.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37881 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-01 12:45:29 +00:00
Sergey Biryukov
8aa1c37590 Docs: Fix typo in WP_Theme_Install_List_Table description.
Props Frozzare.
Fixes #37234.
Built from https://develop.svn.wordpress.org/trunk@37937


git-svn-id: http://core.svn.wordpress.org/trunk@37878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-01 10:27:32 +00:00
Helen Hou-Sandí
7f5717ba5d Meta: Make retrieving registered metadata actually work.
The initial implementation used a `single` argument, which has now been added to the whitelist.

props Faison.
see #35658.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 21:25:27 +00:00
Helen Hou-Sandí
42854ca56f Meta registration: Ensure $args is an array and simplify compat logic.
props ocean90, sc0ttkclark.
see #35658.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37874 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 19:00:31 +00:00
Jeremy Felt
858fb83f57 Docs: Remove duplicate text for is_main_site() parameter.
Props Kenshino.
Fixes #37241.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 17:17:28 +00:00
Drew Jaynes
5e467a2774 Docs: Add changelog entries to the hook doc for the safe_style_css filter denoting recent CSS attribute additions.
* `min-height`, `max-height`, `min-width`, and `max-width` were added in 4.4, see [33739].
* `list-style-type` was added in 4.6, see [37898].

See #35877. See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 17:02:30 +00:00
Jeremy Felt
4789f30c40 Multisite: Simplify logic assigning orderby in get_site_by_path().
Before [37628], there were 3 separate conditions for ordering by domain and/or path in `get_site_by_path()` that each resulted in it's own query. Now that `get_sites()` is used and supports `WP_Site_Query`, this can be simplified.

Props spacedmonkey.
Fixes #37215.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 16:59:29 +00:00
Jeremy Felt
f4d46f0235 Multisite: Revert [37874].
After [37923], `get_blog_details()` contained a now unnecessary attempt at back-compat for objects stored in cache.

See #36717.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 16:40:28 +00:00
Helen Hou-Sandí
48ca588a6c Meta: Actually use fallback auth for the previous registration method.
see #35658.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 16:39:29 +00:00
Andrew Ozz
21ae71eaa1 TinyMCE: do not trigger execCommand on loading, it focuses the editor in Chrome.
Fixes #37243.
Built from https://develop.svn.wordpress.org/trunk@37927


git-svn-id: http://core.svn.wordpress.org/trunk@37868 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 15:18:27 +00:00
Dominik Schilling
b39bddfd2a Post WordPress 4.6 Beta 1 version bump.
Built from https://develop.svn.wordpress.org/trunk@37926


git-svn-id: http://core.svn.wordpress.org/trunk@37867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 01:15:28 +00:00
Dominik Schilling
6b57d103e7 WordPress 4.6 Beta 1.
Built from https://develop.svn.wordpress.org/trunk@37925


git-svn-id: http://core.svn.wordpress.org/trunk@37866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 01:03:27 +00:00
Helen Hou-Sandí
69ccab3405 Introduce an expanded meta registration API.
`register_meta()` has been altered to accept an array of arguments as the third parameter in order to support its usage beyond XML-RPC, notably in the REST API and other projects that may build on top of meta, such as a potential Fields API. Arguments are whitelisted to reserve the right for core to add more later.

New functions added to complement this expansion are:
* `registered_meta_key_exists()`
* `unregister_meta_key()`
* `get_registered_meta_keys()`
* `get_registered_metadata()`
* A "private" function for the aforementioned whitelisting.

There still need to be lots of tests written for previous and new behaviors, and many things are subject to change. Maybe things will explode. #yolo

props jeremyfelt, ericlewis, sc0ttkclark, helen, rmccue, ocean90, voldemortensen.
see #35658.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37865 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-30 01:02:29 +00:00
Jeremy Felt
0358e2f4b8 Multisite: Revert property type changes in WP_Site.
Partial revert of [37657]. Moving existing properties in `WP_Site` from public to private broke backwards compatibility in a pretty severe way. We made an initial attempt to work around this, but due to the variety of possible issues, moving forward does not seem wise.

Fixes #36717.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 22:08:28 +00:00
Dominik Schilling
6c10cda818 Script Loader: Use wp_parse_url() to fix URL parsing failures for PHP < 5.4.7.
See [37920].
See #34292.
Built from https://develop.svn.wordpress.org/trunk@37922


git-svn-id: http://core.svn.wordpress.org/trunk@37863 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 21:05:28 +00:00
Aaron Jorbin
f7465bfcf3 Comments: Further improve text of initial comment.
In [37888], the comment text was initially updated, however an opportunity to make the text less trivializing of actions that users will take was missed. To quote Helen Hou-Sandi: "It's important not to trivialize actions that are perfectly reasonable for a user to find tricky (where to go to log in is not exactly intuitive, even with the rewrites we have now)."

The text of the comment now reads:

> Hi, this is a comment.
> To get started with moderating, editing, and deleting comments, please visit the Comments screen in the dashboard.
> Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.

Some interesting reading on the topic of "Simple" and "Easy" and how they relate to software development can be found at http://andrewspittle.com/2012/01/31/avoiding-easy/ and written by andrewspittle.

Props helen.
Fixes #36702.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37862 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 20:50:27 +00:00
Dominik Schilling
6d7a70e2ce Script Loader: Introduce an API to register resource hints.
Resource hints allow browsers to prefetch specific pages or render them in the background to perform DNS lookups or to begin the connection handshake (DNS, TCP, TLS) in the background.

By default, `wp_resource_hints()` prints hints for "s.w.org" (the WordPress.org CDN) and for all scripts and styles which are enqueued from external hosts.
Use the `wp_resource_hints` filter to add custom domains and URLs for `dns-prefetch`, `preconnect`, `prefetch` or `prerender`.

Props voldemortensen, swissspidy.
Fixes #34292.
Built from https://develop.svn.wordpress.org/trunk@37920


git-svn-id: http://core.svn.wordpress.org/trunk@37861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 19:36:28 +00:00
Drew Jaynes
f93c2807cc Docs: Supplement a changelog entry in the DocBlock for the $id property in WP_Network.
See [37657] for where access was changed from public to private.
See [37870] for where the type was changed from `string` to `int`.

See #36717.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 19:35:28 +00:00
Jeremy Felt
b077123a98 Multisite: Lazy load extended WP_Site properties when requested.
In the past, `get_blog_details()` has been used to retrieve the `home`, `siteurl`, `blogname`, and `post_count` options for a site. By lazy loading properties in a `WP_Site` object, we can avoid having to use `get_blog_details()` and instead provide the properties as needed.

This introduces the global `site-details` cache group in which standard objects representing the site are stored. This will one day be a replacement for the `blog-details` cache group that is currently used in `get_blog_details()`.

This relies on the `ms_loaded` action introduced in [37916] as properties are not available via `get_option()` until multisite has been fully loaded.

Props flixos90.
Fixes #36935.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37859 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 19:32:27 +00:00
Drew Jaynes
b4a1b39a95 Docs: Add changelog entries to the DocBlocks for the $blog_id and $site_id properties in WP_Site.
See [37657] for where access was explicitly changed from public to private.

See #36717.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 19:29:28 +00:00
Jeremy Felt
ba8d3fca8f Multisite: Fire the ms_loaded action after multisite's bootstrap has finished.
This allows code in `sunrise.php` and in core to know when multisite bootstrap is complete and when the `$current_site` and `$current_blog` globals are populated.

Fixes #37235.
Props flixos90.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 19:00:28 +00:00
Joe McGill
170d22a22c Post Thumbnails: Add helper functions for attachment captions.
This adds three new functions for getting/displaying attachment captions:

* `wp_get_attachment_caption` - Retrieves a caption for a specific attachment.
* `get_the_post_thumbnail_caption()` - Returns the post thumbnail caption.
* `the_post_thumbnail_caption()` - Displays the post thumbnail caption.

These are helpful for displaying a caption associated with an image directly
in a template, rather than using the caption shortcode.

This also introduces two new filters:

* `wp_get_attachment_caption` - Filters the value of `wp_get_attachment_caption()`.
* `the_post_thumbnail_caption` - Filters the display of the post thumbnail caption.

`the_post_thumbnail_caption()` is automatically filtered by `wptexturize()`,
`convert_smilies()`, and `convert_chars()` in `wp-includes/default-filters.php`.

Props flixos90, joemcgill.
Fixes #12235.
Built from https://develop.svn.wordpress.org/trunk@37915


git-svn-id: http://core.svn.wordpress.org/trunk@37856 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 17:28:28 +00:00
Dominik Schilling
25e66e4f1e Text Changes: Unify permission error messages.
The new format looks like "Sorry, you are not allowed to <action>.". This provides a consistent experience for all error messages related to missing permissions. It also reduces the number of similar strings and allows translators to provide a consistent style in their language.

Props ramiy, Presskopp.
Fixes #34521.
Built from https://develop.svn.wordpress.org/trunk@37914


git-svn-id: http://core.svn.wordpress.org/trunk@37855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 15:16:29 +00:00
Dominik Schilling
0b7b8981aa Posts: In wp_ajax_inline_save(), do not apply level for non-hierarchical post types.
Props Offereins.
Fixes #35010.
Built from https://develop.svn.wordpress.org/trunk@37913


git-svn-id: http://core.svn.wordpress.org/trunk@37854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 14:07:31 +00:00
Andrea Fercia
809ad6e429 List tables: Make the pagination links and text better responsive.
On small screens, especially with longer translations, the pagination links and
text could break in two lines. This fixes it moving down the text in a new line.

Fixes #33962.
Built from https://develop.svn.wordpress.org/trunk@37912


git-svn-id: http://core.svn.wordpress.org/trunk@37853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 13:30:28 +00:00
Dominik Schilling
e210ea830b Plugins: Return the original value in apply_filters_deprecated() if no filter is registered for the tag.
Props flixos90.
Fixes #10441.
Built from https://develop.svn.wordpress.org/trunk@37911


git-svn-id: http://core.svn.wordpress.org/trunk@37852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 13:22:27 +00:00
Andrew Ozz
397376d5a1 TinyMCE: update to 4.3.13, changelog: https://github.com/tinymce/tinymce/blob/master/changelog.txt.
Fixes #37225.
Built from https://develop.svn.wordpress.org/trunk@37910


git-svn-id: http://core.svn.wordpress.org/trunk@37851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 13:21:27 +00:00
Dominik Schilling
d83e08cdb1 Tests: After [37861] move tests for deprecated filters into filters.php.
See #10441.
Built from https://develop.svn.wordpress.org/trunk@37909


git-svn-id: http://core.svn.wordpress.org/trunk@37850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 13:14:27 +00:00
Dominik Schilling
0c7a9a4bd6 I18N: Localize the jQuery UI datepicker.
This provides some default data for the jQuery UI datepicker. The localized data is already available via `WP_Locale` and is only passed to the datepicker if the script is enqueued.

Props clubduece, swissspidy, barryceelen, ocean90.
Fixes #29420.
Built from https://develop.svn.wordpress.org/trunk@37908


git-svn-id: http://core.svn.wordpress.org/trunk@37849 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 12:58:29 +00:00
Dominik Schilling
cb0f2a546b HTTP: Add unit tests for wp_get_http_headers() and wp_remote_retrieve_headers().
Props borgesbruno, jipmoors.
Fixes #37090.
Built from https://develop.svn.wordpress.org/trunk@37907


git-svn-id: http://core.svn.wordpress.org/trunk@37848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 12:47:28 +00:00
Andrew Ozz
c4af09a2b9 TinyMCE, inline link dialog:
- Reset the internal state when doing `unlink`, pressing `Escape`, and clicking elsewhere in the editor.
- Add the unlink shortcut from the wplink plugin as it triggers the new `wp_unlink` command.

Fixes #36781, #36732, #37153.
Built from https://develop.svn.wordpress.org/trunk@37906


git-svn-id: http://core.svn.wordpress.org/trunk@37847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 09:42:30 +00:00
Rachel Baker
41369b1ced REST API: Include a refreshed nonce in a X-WP-Nonce header when responding to an authenticated request.
Props adamsilverstein, welcher, markjaquith, aidvu.
Fixes #35662.



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


git-svn-id: http://core.svn.wordpress.org/trunk@37846 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 03:02:07 +00:00
Rachel Baker
b8faa92421 Customize: Text change on Widgets and Menus screens for buttons directing users to the Customizer.
"Manage in Customizer" -> "Manage with Live Preview".

Props patilswapnilv and noahsilverstein.
Fixes #37159.



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


git-svn-id: http://core.svn.wordpress.org/trunk@37845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 02:11:27 +00:00