Commit Graph

34727 Commits

Author SHA1 Message Date
Andrea Fercia 0a12bb2341 Accessibility: Ensure only text is sent to aria-live messages.
While messages passed to `wp.speak.a11y()` should preferably be meaningful,
short, and carefully crafted case by case, this will ensure any HTML tags will
be stripped out from the message string.

Props adamsilverstein.
Fixes #37382.
Built from https://develop.svn.wordpress.org/trunk@38115


git-svn-id: http://core.svn.wordpress.org/trunk@38056 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-20 14:26:28 +00:00
Rachel Baker bc46a94a4d Tests: Include the `check_comment` function tests in the comment group.
Adds `@group comment` notation to the `Tests_Comment_CheckComment` class. Introduced in [32519].

Props gma992.
Fixes #37356.
Built from https://develop.svn.wordpress.org/trunk@38114


git-svn-id: http://core.svn.wordpress.org/trunk@38055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-20 14:07:31 +00:00
Mike Schroder 1736b7b29c Media: Clean up prior image edits if `IMAGE_EDIT_OVERWRITE` is true.
When `IMAGE_EDIT_OVERWRITE` is set to true, edited image files are
supposed to be deleted when an image is restored to the original.

However, when an image was edited more than once, and then restored,
files created during previous edits were left behind.

Fixes this behavior by updating `wp_save_image()` to clean up
leftover images after each edit when `IMAGE_EDIT_OVERWRITE` is true.

Props bradt, chriscct7, joemcgill.
Fixes #32171.
Built from https://develop.svn.wordpress.org/trunk@38113


git-svn-id: http://core.svn.wordpress.org/trunk@38054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-20 07:35:28 +00:00
Drew Jaynes c64e599ae2 Docs: Add missing class, method, and property DocBlocks for feed classes.
Covers:

* `WP_Feed_Cache`
* `WP_Feed_Cache_Transient`
* `WP_SimplePie_File`
* `WP_SimplePie_Sanitize_KSES`

Props ramiy, stevenkword.
Fixes #36295.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-20 07:33:29 +00:00
Gary Pendergast 3830c3f0b3 Tools: Update `grunt-patch-wordpress` to 0.4.2.
This update fixes invalid patches being uploaded to Trac when the `diff-cmd` is set to `colordiff`.

Props jorbin.
Fixes #37410.


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


git-svn-id: http://core.svn.wordpress.org/trunk@38052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-20 06:49:38 +00:00
Andrew Ozz ba81f46c64 TinyMCE: replace the editor iframe title on MacOS to fix the help shortcut.
Props afercia, azaozz.
Fixes #36863.
Built from https://develop.svn.wordpress.org/trunk@38110


git-svn-id: http://core.svn.wordpress.org/trunk@38051 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-20 01:39:31 +00:00
Sergey Biryukov 6c7a60ffb4 Permalinks: In `wp_install_maybe_enable_pretty_permalinks()`:
* Use `get_page_by_path()` instead of a hardcoded ID, which may not always exist.
* Remove the "test against a random 404 page" part, which is no longer relevant after [34442].

Fixes #36628.
Built from https://develop.svn.wordpress.org/trunk@38109


git-svn-id: http://core.svn.wordpress.org/trunk@38050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 23:12:32 +00:00
Jeremy Felt 65ffc1ff42 Meta: Ensure `$wp_meta_keys` is an array in `get_registered_meta_keys()`.
Props vishalkakadiya.
Fixes #37415, See #35658.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38049 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 21:59:44 +00:00
Drew Jaynes 949bc7c7e3 Docs: Use the three-digit, x.x.x-style version in the DocBlock for the nested `lowercase_octets()` function.
See #32246. See #meta942.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38048 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 19:34:29 +00:00
Drew Jaynes f929f502fa Docs: Add a missing DocBlock for the `lowercase_octets()` function, which is nested within `redirect_canonical()`.
Will be skipped from parsing.

See #32246. See #meta942.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 19:32:32 +00:00
Drew Jaynes c415dd186b Readme: Link to the Plugin Developer Handbook on DevHub as the primary resource for information on extending WordPress.
The `Plugin API` article in the Codex is no longer actively maintained.

Props morganestes.
Fixes #37399.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38046 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 17:34:44 +00:00
Sergey Biryukov 2443c89ee0 Docs: Clarify the `fields` argument description in `WP_Network_Query::__construct()`.
See #32504.
Built from https://develop.svn.wordpress.org/trunk@38104


git-svn-id: http://core.svn.wordpress.org/trunk@38045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 13:18:28 +00:00
Sergey Biryukov c277d565e5 Docs: Clarify the `fields` argument description in `WP_Site_Query::__construct()`.
Props ramiy.
See #35791.
Built from https://develop.svn.wordpress.org/trunk@38103


git-svn-id: http://core.svn.wordpress.org/trunk@38044 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 13:15:28 +00:00
Sergey Biryukov a7c72c31cf Multisite: Correct default value for `orderby` in `WP_Network_Query::__construct()`.
Add a unit test.

See #32504.
Built from https://develop.svn.wordpress.org/trunk@38102


git-svn-id: http://core.svn.wordpress.org/trunk@38043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 13:10:29 +00:00
Dominik Schilling f645178391 Filesystem API: Ensure memory limit calculations by PclZip are using integers.
This prevents a warning in PHP trunk, see https://wiki.php.net/rfc/invalid_strings_in_arithmetic.

See #36435.
Built from https://develop.svn.wordpress.org/trunk@38101


git-svn-id: http://core.svn.wordpress.org/trunk@38042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 11:55:30 +00:00
Peter Wilson a693987b91 Script Loader: Limit resource hinting to enqueued assets.
Externally hosted script and style dependencies trigger `dns-prefetch` hinting only when enqueued. This removed a bug in which hinting was added on registration.

Renames the function `wp_resource_hints_scripts_styles` to `wp_dependencies_unique_hosts` as the function provides the hosts, not the hinting.

Props swissspidy.
Fixes #37385.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38041 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 02:35:31 +00:00
Boone Gorges 01b9ca2292 Taxonomy: Improve back compat of values passed to 'terms_clauses' filter.
Prior to the introduction of `WP_Term_Query`, the 'orderby' clause
passed to the 'terms_clauses' filter was prefixed by `ORDER BY`. After
`WP_Term_Query`, this was not the case; `ORDER BY` was added after the
filter. As such, plugins filtering 'terms_clauses' and returning an
'orderby' clause beginning with `ORDER BY` resulted in invalid syntax
when `WP_Term_Query` prepended a second `ORDER BY` keyword to
the clause.

This changeset rearranges the way the 'orderby' clause is built so that
it will be passed to 'terms_clauses' in the previous format.

Fixes #37378.
Built from https://develop.svn.wordpress.org/trunk@38099


git-svn-id: http://core.svn.wordpress.org/trunk@38040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 02:13:28 +00:00
Rachel Baker 093b16dfcd Docs: Correct `comment_max_links_url` filter and `$url` param descriptions to communicate values are found links.
`$num_links` is the number of link matches found within the comment_content, and that is the value that can be modified with the `comment_max_links_url` filter.

Props pbearne.
Fixes #37319.
Built from https://develop.svn.wordpress.org/trunk@38098


git-svn-id: http://core.svn.wordpress.org/trunk@38039 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-19 01:49:30 +00:00
Weston Ruter 11cb0cfe86 Docs: Correct type of `WP_Post_Type::$cap` from `array` to `object`.
Fixes typo introduced in r37890. The `WP_Post_Type::$cap` property is set to the return value of `get_post_type_capabilities()` which is an `object`.

See #36217.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 22:52:29 +00:00
John Blackbourn 409fb0332e Role/Capability: Introduce capability tests for non-logged-in users.
Fixes #37405

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


git-svn-id: http://core.svn.wordpress.org/trunk@38037 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 22:39:30 +00:00
Jeremy Felt 30851d1186 Meta: Remove object subtype handling from `register_meta()`.
Registration is now based solely on object type, which allows the code around this to be simplified significantly.

In the process of making this adjustment:

* `register_meta()`, `unregister_meta_key()`, `get_registered_metadata()`, and `registered_meta_key_exists()` no longer return `WP_Error` objects.
* The recently introduced `wp_object_type_exists()` function and the restriction on object type has been removed.

Note: No guarantee of uniqueness is made across object subtypes. Registered meta keys should be uniquely prefixed to avoid conflict.

Fixes #35658.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 21:16:29 +00:00
Dominik Schilling d59bcc98df Filesystem API: Cleanup temporary file when the temporary file couldn't be opened.
Props ruud@joyo.
See #34772.
Fixes #36942, #36943.
Built from https://develop.svn.wordpress.org/trunk@38094


git-svn-id: http://core.svn.wordpress.org/trunk@38035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 19:43:30 +00:00
Tammie Lister ee20f7606b Remove .pot files from Default Themes
Fixes #34884
Props davidakennedy

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


git-svn-id: http://core.svn.wordpress.org/trunk@38034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 14:33:31 +00:00
Dominik Schilling da88178148 Comments: Use `wp_strip_all_tags()` to strip HTML tags.
`wp_kses()` should only be used if you have a whitelist.

Props rachelbaker.
Fixes #37208.
Built from https://develop.svn.wordpress.org/trunk@38092


git-svn-id: http://core.svn.wordpress.org/trunk@38033 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 14:04:31 +00:00
Dominik Schilling a320320ea0 Plugins: Use the correct admin screen when searching for plugins via Ajax.
Both list tables provide different actions based on where they are loaded, regular admin or network admin. Since there is only one Ajax handler for both screens we have to set the current screen before using the list tables.

Props swissspidy, ocean90.
Fixes #37373.
Built from https://develop.svn.wordpress.org/trunk@38091


git-svn-id: http://core.svn.wordpress.org/trunk@38032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 14:00:34 +00:00
Dominik Schilling ea38eaca7d Media: Add missing gettext to a string added in [38089].
See #37394.
Built from https://develop.svn.wordpress.org/trunk@38090


git-svn-id: http://core.svn.wordpress.org/trunk@38031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 12:39:29 +00:00
Dominik Schilling 478f8c16dc Media: Update list of translatable strings for MediaElement.js.
Fixes #37394.
Built from https://develop.svn.wordpress.org/trunk@38089


git-svn-id: http://core.svn.wordpress.org/trunk@38030 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 11:30:28 +00:00
Dominik Schilling 20f0aeb0f7 External Libraries: Update MediaElement.js to 2.22.0.
Includes a fix for broken YouTube embeds which are embedded with the `[video]` shortcode. 

Changelog: https://github.com/johndyer/mediaelement/blob/2.22.0/changelog.md
Diff: https://github.com/johndyer/mediaelement/compare/2.21.1...2.22.0

Fixes #37363.
Built from https://develop.svn.wordpress.org/trunk@38088


git-svn-id: http://core.svn.wordpress.org/trunk@38029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 10:59:30 +00:00
Gary Pendergast 46ac7ac930 Emoji: Update to Unicode 9.0 emoji.
This includes a new test in the emoji loader, to see if the browser supports rendering Unicode 9.0 emoji, as well as an update to `twemoji.js`, to load Unicode 9.0 twemoji images.

The default CDN location for loading Twemoji images has changed, moving to a versioned subdirectory. This allows updates without needing to purge the CDN.

Fixes #37361.


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


git-svn-id: http://core.svn.wordpress.org/trunk@38028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 07:35:39 +00:00
Joe McGill 28a132dfee Media: Prevent `image_get_intermediate_size()` from returning cropped images.
When `$size` is passed to `image_get_intermediate_size()` as an array of width
and height values and an exact image size matching those values isn't available,
the function loops through the available attachment sizes and returns the
smallest image larger than the requested dimensions with the same aspect ratio.

The aspect ratio check is skipped for the 'thumbnail' size to provide a fallback
for small sizes when no other image option is available. This resulted in a poor
selection when the size requested was smaller than the 'thumbnail' dimensions
but a larger size matching the requested ratio existed.

This refactors the internals of `image_get_intermediate_size()` to ensure the
'thumbnail' size is only returned as a fallback to small sizes once all other
options have been considered, and makes the control flow easier to follow.

This also introduces a new helper function, `wp_image_matches_ratio()` for
testing whether the aspect ratios of two sets of dimensions match. This function
is also now used in `wp_calculate_image_srcset()` during the selection process.

Props flixos, joemcgill.
Fixes #34384, #34980.
Built from https://develop.svn.wordpress.org/trunk@38086


git-svn-id: http://core.svn.wordpress.org/trunk@38027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 02:14:29 +00:00
Sergey Biryukov eca1a22719 Multisite: Correct default values for `orderby` and `order` in `WP_Site_Query::__construct()`.
Add a unit test.

Props ramiy, SergeyBiryukov.
See #35791.
Built from https://develop.svn.wordpress.org/trunk@38085


git-svn-id: http://core.svn.wordpress.org/trunk@38026 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 23:30:31 +00:00
Andrea Fercia bf24773fc6 Accessibility: Improve keyboard navigation on the themes browser modal window.
Improves the `containFocus()` function to always get the correct first and last
focusable elements, even when the theme browser shows the active theme details.
Also, when on the first and last theme, adds a `disabled` attribute on the
previous and next navigation buttons to make them not focusable.

Fixes #37383.
Built from https://develop.svn.wordpress.org/trunk@38084


git-svn-id: http://core.svn.wordpress.org/trunk@38025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 22:19:30 +00:00
Weston Ruter 36e46af382 Twenty Thirteen: Fix selective refresh of Masonry-laid out widgets by deferring initialization until DOM ready.
This ensures that the `wp.customize.selectiveRefresh` object will be available when in the Customizer preview.

Fixes #37390.
Props westonruter, celloexpressions.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 21:14:29 +00:00
Sergey Biryukov fd2d9ef63b I18N: Remove non-translatable link attributes from translatable strings in `wp_plugin_update_row()`, `wp_theme_update_row()`, and `get_theme_update_available()`.
The resulting strings are much easier to translate.

See #36048.
Built from https://develop.svn.wordpress.org/trunk@38082


git-svn-id: http://core.svn.wordpress.org/trunk@38023 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 21:03:31 +00:00
Sergey Biryukov 2d19f94fac Text Changes: Change `Network deactivate %s` to upper case, for consistency with `Network Activate %s`.
See #37290.
Built from https://develop.svn.wordpress.org/trunk@38081


git-svn-id: http://core.svn.wordpress.org/trunk@38022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 17:04:32 +00:00
Sergey Biryukov 65ff895eca I18N: Combine duplicate "Menu Locations" and "Menu Options" strings.
Props ramiy.
See #18218.
Built from https://develop.svn.wordpress.org/trunk@38080


git-svn-id: http://core.svn.wordpress.org/trunk@38021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 16:47:39 +00:00
Sergey Biryukov d851a2cded Taxonomy: Correct `WP_Error` usage in `WP_Tax_Query::clean_query()` and `WP_Tax_Query::transform_query()`.
Fixes #37389.
Built from https://develop.svn.wordpress.org/trunk@38079


git-svn-id: http://core.svn.wordpress.org/trunk@38020 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 16:33:30 +00:00
Sergey Biryukov 3fb7d586da Unit Tests: Account for the string changes in [38077].
See #18218.
Built from https://develop.svn.wordpress.org/trunk@38078


git-svn-id: http://core.svn.wordpress.org/trunk@38019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 16:24:28 +00:00
Sergey Biryukov 7d421dbe42 Text Changes: Add a full stop to "Invalid taxonomy" and "Invalid term ID" strings, for consistency with similar post-related messages.
See #18218, #32329.
Built from https://develop.svn.wordpress.org/trunk@38077


git-svn-id: http://core.svn.wordpress.org/trunk@38018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 16:15:34 +00:00
Sergey Biryukov 866bd39813 I18N: Combine two duplicate "Invalid post type" strings.
Props @ramiy.
See #18218.
Built from https://develop.svn.wordpress.org/trunk@38076


git-svn-id: http://core.svn.wordpress.org/trunk@38017 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 16:05:31 +00:00
Dominik Schilling d5cb80dd7f Import: Enhance accessibility on the Import screen.
* Remove title attributes.
* Show "Install Now" and "Details" links if the importer isn't installed yet.
* Show a "Run Importer" link if the importer is installed. It also handles activation if the plugin isn't activated.
* Add `aria-label` attributes to each link.
* Unify the importer descriptions to make them independent from the plugin state. The API was changed in [meta3690].
* Adjust JavaScript callbacks for ajaxified importer installs.

Props afercia, swissspidy, ocean90.
See #24766.
Fixes #35191.
Built from https://develop.svn.wordpress.org/trunk@38075


git-svn-id: http://core.svn.wordpress.org/trunk@38016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 15:32:30 +00:00
Sergey Biryukov 48f9940cfc I18N: Change unnecessary uppercased words in `WP_Upgrader::generic_strings()` to lower case.
See #18218.
Built from https://develop.svn.wordpress.org/trunk@38074


git-svn-id: http://core.svn.wordpress.org/trunk@38015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 13:29:29 +00:00
Sergey Biryukov f429056194 I18N: Combine two duplicate "Unable to locate WordPress Theme directory" strings.
See #18218.
Built from https://develop.svn.wordpress.org/trunk@38073


git-svn-id: http://core.svn.wordpress.org/trunk@38014 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 12:58:28 +00:00
Sergey Biryukov cbd59fdfd0 Text Changes: After [37297], replace two more instances of "WordPress.org Plugin Directory" with "WordPress Plugin Directory".
See #35938.
Built from https://develop.svn.wordpress.org/trunk@38072


git-svn-id: http://core.svn.wordpress.org/trunk@38013 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-17 12:50:43 +00:00
Sergey Biryukov 0be3a84ad0 I18N: After [38057], consistently use a context for other instances of `Activate %s`, `Network Activate %s`, and `Delete %s` strings.
See #37290.
Built from https://develop.svn.wordpress.org/trunk@38071


git-svn-id: http://core.svn.wordpress.org/trunk@38012 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-16 23:20:29 +00:00
Sergey Biryukov 50a39d4b1f I18N: Remove a stray translator comment added in [38057].
See #37290.
Built from https://develop.svn.wordpress.org/trunk@38070


git-svn-id: http://core.svn.wordpress.org/trunk@38011 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-16 23:11:31 +00:00
Boone Gorges 40741408ec On term.php, use `$taxnow` when fetching currently edited term.
[36874] changed the `get_term()` call so that no `$taxonomy` parameter
was passed, as 4.4 made the parameter optional. This change made it
impossible to access a shared term that has not yet been splitr, since
passing an ambiguous `$term_id` to `get_term()` results in an error.
Restoring the `$taxonomy` parameter fixes the regression.

Props alleynoah, dlh.
Fixes #37205.
Built from https://develop.svn.wordpress.org/trunk@38069


git-svn-id: http://core.svn.wordpress.org/trunk@38010 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-16 18:37:30 +00:00
Sergey Biryukov f5aab6e25d Docs: Correct `$post` parameter name and description for `wp_attachment_is()` and `wp_attachment_is_image()`.
Props flixos90.
Fixes #37377.
Built from https://develop.svn.wordpress.org/trunk@38068


git-svn-id: http://core.svn.wordpress.org/trunk@38009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-16 13:05:29 +00:00
Sergey Biryukov 5cce706f3d Permalinks: Rename `$usingpi` to `$using_index_permalinks` for clarity.
See #37380.
Built from https://develop.svn.wordpress.org/trunk@38067


git-svn-id: http://core.svn.wordpress.org/trunk@38008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-16 12:46:29 +00:00
Sergey Biryukov 07c9671cac Permalinks: After [37747], make sure `$usingpi`, `$writable`, and `$update_required` are defined before checking them on permalinks update.
Props Clorith.
Fixes #37380.
Built from https://develop.svn.wordpress.org/trunk@38066


git-svn-id: http://core.svn.wordpress.org/trunk@38007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-16 12:44:32 +00:00