Commit Graph

15688 Commits

Author SHA1 Message Date
Drew Jaynes
bef05b469b Docs: Standardize DocBlock summaries for hooks that serve to "print" something to use third-person singular verbs.
See #36913.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-25 16:05:27 +00:00
Drew Jaynes
62d4798863 Docs: Update hook docs for the upgrader_package_options filter and upgrader_process_complete action to reflect expected values in the core, language pack, theme, and plugin contexts.
Props nextendweb for the initial patch.
See [37550]. Fixes #36875.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37526 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-25 14:45:27 +00:00
Dominik Schilling
8369b778e1 I18N: Update list of continents and cities for the timezone selection.
Fixes #36828.
Built from https://develop.svn.wordpress.org/trunk@37554


git-svn-id: http://core.svn.wordpress.org/trunk@37522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-24 23:24:27 +00:00
Dominik Schilling
76ade1b21d Dashboard: Improve grammar for WordPress News help text.
Also, move planet URL to a separate string to match the URL which is used for the feed.

Props ramiy for initial patch.
Fixes #35681.
Built from https://develop.svn.wordpress.org/trunk@37553


git-svn-id: http://core.svn.wordpress.org/trunk@37521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-24 21:22:28 +00:00
Drew Jaynes
ada2858cd9 Docs: Fix the hook doc for upgrader_process_complete to notate all values that might be present in the hook_extra array in the various update contexts.
h/t Nextendweb.

See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-24 17:52:30 +00:00
Drew Jaynes
6d7abb8fd3 Docs: The $context parameter in remove_meta_box() is not optional.
Fixes a copy pasta error introduced in [34952].

Props travisnorthcutt.
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 20:57:28 +00:00
Dominik Schilling
a5b8dca864 Database: Support backticks around field names when parsing a query for the field type.
Avoids an undefined index PHP warning by `dbDelta()`.

Props davidmosterd, ocean90.
See #20263.
Built from https://develop.svn.wordpress.org/trunk@37538


git-svn-id: http://core.svn.wordpress.org/trunk@37506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 18:12:28 +00:00
Drew Jaynes
1947f4d17c Docs: Apply inline @see tags to hooks referenced in DocBlocks for wp-admin/* files.
Applying these specially-crafted `@see` tags allows the Code Reference parser to recognize and link these elements as actions and filters.

See #36921.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 17:28:27 +00:00
Drew Jaynes
11d6f0712e Docs: Update the return notation for get_current_screen() to note that null can also be returned if the screen has not been defined.
Props screamingdev.
Fixes #36382.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37502 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 16:34:28 +00:00
Dominik Schilling
00487d5762 Database: Remove debug comments in dbDelta().
Built from https://develop.svn.wordpress.org/trunk@37533


git-svn-id: http://core.svn.wordpress.org/trunk@37501 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 15:04:28 +00:00
Dominik Schilling
e5a87afb29 Database: Reduce the number of strtolower() calls in dbDelta().
Fixes #36919.
Built from https://develop.svn.wordpress.org/trunk@37532


git-svn-id: http://core.svn.wordpress.org/trunk@37500 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 14:58:27 +00:00
Dominik Schilling
e5dd89ae57 Menus: Use new colors for error/info notices.
Props barryceelen.
Fixes #36857.
Built from https://develop.svn.wordpress.org/trunk@37529


git-svn-id: http://core.svn.wordpress.org/trunk@37497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 09:40:28 +00:00
Gary Pendergast
18ca26574b Database: dbDelta() will no longer try to downgrade the size of TEXT and BLOB columns.
When upgrading to `utf8mb4`, `TEXT` fields will be upgraded to `MEDIUMTEXT` (and likewise for all other `*TEXT` and `*BLOB` fields). This is to allow for the additional space requirements of `utf8mb4`.

On the subsequent upgrade, after the `utf8mb4` upgrade, `dbDelta()` would try and downgrade the fields to their original size again. At best, this it a waste of time, at worst, this could truncate any data larger than the original size. There's no harm in leaving them at their original size, so let's do that.

Fixes #36748.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37493 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 08:36:28 +00:00
Gary Pendergast
25d2123821 Database: Remove some duplicate code.
`schema.php` was manually defining the character set/collation query, instead of using `wpdb::get_charset_collate()`.

Props sudar.

Fixes #35756.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37492 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 06:38:27 +00:00
Drew Jaynes
c3055cc190 Docs: Standardize hook docs in wp-admin/* to use third-person singular verbs per the inline documentation standards for PHP.
See #36913.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-22 18:01:30 +00:00
Drew Jaynes
a54c2a7279 Docs: Remove/replace invalid inline @link tags from DocBlocks in wp-admin/includes/*.
See #36910.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37453 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-22 17:22:27 +00:00
Drew Jaynes
ac74c103a8 Docs: Fix some parameter alignment and backtick-escaping in two DocBlocks in wp-admin/includes/media.php.
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37452 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-22 17:18:27 +00:00
Drew Jaynes
c0d7dece23 Docs: Remove invalid inline @link tags from docs in wp-admin/includes/media.php.
See #36910.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-22 17:10:26 +00:00
Weston Ruter
87b0a1b989 Customize: Add setting validation model and control notifications to augment setting sanitization.
When a setting is invalid, not only will it be blocked from being saved but all other settings will be blocked as well. This ensures that Customizer saves aren't partial but are more transactional. User will be displayed the error in a notification so that they can fix and re-attempt saving.

PHP changes:

* Introduces `WP_Customize_Setting::validate()`, `WP_Customize_Setting::$validate_callback`, and the `customize_validate_{$setting_id}` filter.
* Introduces `WP_Customize_Manager::validate_setting_values()` to do validation (and sanitization) for the setting values supplied, returning a list of `WP_Error` instances for invalid settings.
* Attempting to save settings that are invalid will result in the save being blocked entirely, with the errors being sent in the `customize_save_response`. Modifies `WP_Customize_Manager::save()` to check all settings for validity issues prior to calling their `save` methods.
* Introduces `WP_Customize_Setting::json()` for parity with the other Customizer classes. This includes exporting of the `type`.
* Modifies `WP_Customize_Manager::post_value()` to apply `validate` after `sanitize`, and if validation fails, to return the `$default`.
* Introduces `customize_save_validation_before` action which fires right before the validation checks are made prior to saving.

JS changes:

* Introduces `wp.customize.Notification` in JS which to represent `WP_Error` instances returned from the server when setting validation fails.
* Introduces `wp.customize.Setting.prototype.notifications`.
* Introduces `wp.customize.Control.prototype.notifications`, which are synced with a control's settings' notifications.
* Introduces `wp.customize.Control.prototype.renderNotifications()` to re-render a control's notifications in its notification area. This is called automatically when the notifications collection changes.
* Introduces `wp.customize.settingConstructor`, allowing custom setting types to be used in the same way that custom controls, panels, and sections can be made.
* Injects a notification area into existing controls which is populated in response to the control's `notifications` collection changing. A custom control can customize the placement of the notification area by overriding the new `getNotificationsContainerElement` method.
* When a save fails due to setting invalidity, the invalidity errors will be added to the settings to then populate in the controls' notification areas, and the first such invalid control will be focused.

Props westonruter, celloexpressions, mrahmadawais.
See #35210.
See #30937.
Fixes #34893.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37444 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-20 21:10:27 +00:00
Andrea Fercia
ce94f2dfbd Refine the FTP credentials form interaction.
Properly toggle SSH2 Authentication Keys fieldset visibility.
JavaScript and CSS clean-up.

Props Mte90.
Fixes #34376.
Built from https://develop.svn.wordpress.org/trunk@37467


git-svn-id: http://core.svn.wordpress.org/trunk@37435 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-19 22:59:28 +00:00
Jeremy Felt
4a12078b31 Multisite: Filter the links displayed on "Edit Site" views
Introduce the `network_edit_site_nav` function, which DRYs up the code used to display a common set of links at the top of "Edit Site" views.

Introduce the `network_edit_site_nav_links` filter, which allows plugins to modify the list of links displayed at the top of Edit Site views as a "tabbed" interface.

Props johnjamesjacoby, c3mdigital, Bueltge.
Fixes #15800.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37434 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-19 21:48:30 +00:00
Sergey Biryukov
117cef2d46 Docs: Correct variable type for WP_Upgrader::$strings.
Props mt8.biz.
Fixes #36883.
Built from https://develop.svn.wordpress.org/trunk@37462


git-svn-id: http://core.svn.wordpress.org/trunk@37430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-19 00:36:27 +00:00
Dominik Schilling
9f7856f103 Remove duplicate CSS selectors in forms.css.
Props bassgang.
Fixes #36580.
Built from https://develop.svn.wordpress.org/trunk@37458


git-svn-id: http://core.svn.wordpress.org/trunk@37426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-18 12:20:29 +00:00
Helen Hou-Sandí
848501711a System font: The stack does not work with the font shorthand property.
see #36753.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37410 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-17 01:45:27 +00:00
Andrea Fercia
1ae8891261 Accessibility: make the tab order match the visual order in the Edit terms screens.
Fixes #35664.
Built from https://develop.svn.wordpress.org/trunk@37439


git-svn-id: http://core.svn.wordpress.org/trunk@37405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-16 13:02:29 +00:00
Weston Ruter
dcf6cf3615 Customize: Include shortcut button in Custom Menu widget to edit the selected menu in the Customizer.
Clicking on the Edit Menu button focuses on the corresponding nav menu section. Upon collapsing the nav menu section, the focus is returned to the Custom Menu widget instead of taking the user to the menus root panel. In this way, the back button behavior is modified once to serve as breadcrumb/history navigation. The Edit Menu button with the breadcrumb back button behavior greatly reduce the number of UI interactions needed to edit a menu referenced in a Custom Menu widget.

Props celloexpressions, westonruter.
Fixes #32683.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-16 07:22:30 +00:00
Joe McGill
bdfd58c8cf Media: Remove medium_large size from $whitelist_options['media'] in options.php.
The `medium_large_size_w` and `medium_large_size_h` options were added to the
$whitelist_options['media'] in options.php in [35479], which causes both options
to be set to `0` when the media settings are changed. When this occurs, the
medium_large image size will no longer be created when an image is uploaded.

Since these options aren't meant to be updated via the settings UI, they can be
safely removed from the whitelist.

Fixes #36531.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-15 22:38:29 +00:00
Dominik Schilling
944a69df87 Credits: Add a missing closing tag.
Props ramiy for initial patch.
Fixes #35911.
Built from https://develop.svn.wordpress.org/trunk@37434


git-svn-id: http://core.svn.wordpress.org/trunk@37400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-14 18:58:31 +00:00
Dominik Schilling
f81b65688a Upgrader: Add changelog entries for when the classes were moved to its own file.
See #36618.
Built from https://develop.svn.wordpress.org/trunk@37432


git-svn-id: http://core.svn.wordpress.org/trunk@37398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-13 20:59:27 +00:00
Drew Jaynes
b1804afeaf Docs: Standardize on 'backward compatibility/compatible' nomenclature in core inline docs.
Also use 'back-compat' in some inline comments where backward compatibility is the subject and shorthand feels more natural.

Note: 'backwards compatibility/compatibile' can also be considered correct, though it's primary seen in regular use in British English.

Props ocean90.
Fixes #36835.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-13 18:41:31 +00:00
Weston Ruter
b036bf1012 Customize: Clean up media control CSS.
Removes unnecessary wrapper elements and refactors class names to eliminate duplication of rule selectors.

Props celloexpressions.
Fixes #30618.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-12 20:23:54 +00:00
Dominik Schilling
7f1abd441f Posts: Fire a post_action_{$action} action for a custom post action request.
Props jfarthing84, Mte90, brianvan, sudar, DrewAPicture.
Fixes #27056.
Built from https://develop.svn.wordpress.org/trunk@37424


git-svn-id: http://core.svn.wordpress.org/trunk@37390 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-12 15:44:28 +00:00
Dominik Schilling
251274abf6 List Tables: Pass the $which parameter to restrict_manage_posts and restrict_manage_users.
`$which` contains the location of the extra table nav markup: 'top' or 'bottom'.

Props martin.krcho.
Fixes #35307.
Built from https://develop.svn.wordpress.org/trunk@37422


git-svn-id: http://core.svn.wordpress.org/trunk@37388 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-12 15:13:27 +00:00
Dominik Schilling
546b031453 Filesystem API: Don't add '.' to the list of directories which need to be checked/created when extracting a file.
Prevents a PHP warning by `WP_Filesystem_Direct::mkdir()` when installing a language pack which doesn't have subdirectories.

Props tfrommen.
Fixes #36570.
Built from https://develop.svn.wordpress.org/trunk@37421


git-svn-id: http://core.svn.wordpress.org/trunk@37387 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-12 12:40:28 +00:00
Dominik Schilling
1564bd2c1f Upgrader: Remove debug cruft.
See #36618.
Built from https://develop.svn.wordpress.org/trunk@37413


git-svn-id: http://core.svn.wordpress.org/trunk@37379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-10 18:32:28 +00:00
Dominik Schilling
a8525b1109 Upgrader: After [37409] move the hook docs for upgrader_process_complete to WP_Upgrader::run().
Add changelog entry for [23912].

Part 7/8.
See #36618.
Built from https://develop.svn.wordpress.org/trunk@37412


git-svn-id: http://core.svn.wordpress.org/trunk@37378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-10 12:20:27 +00:00
Dominik Schilling
5844c585f6 Upgrader: Update wp-admin/includes/class-wp-upgrader.php to require_once the new files added in [37406] and [37409].
Part 6/8.
See #36618.
Built from https://develop.svn.wordpress.org/trunk@37411


git-svn-id: http://core.svn.wordpress.org/trunk@37377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-10 11:59:27 +00:00
Dominik Schilling
23e2a486ae Upgrader: Update file headers for new files added in [37409].
Part 5/8.
See #36618.
Built from https://develop.svn.wordpress.org/trunk@37410


git-svn-id: http://core.svn.wordpress.org/trunk@37376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-10 11:52:28 +00:00
Dominik Schilling
14e5d77132 Upgrader: Copy WP_Upgrader subclasses into one file per class.
Part 4/8.
See #36618.
Built from https://develop.svn.wordpress.org/trunk@37409


git-svn-id: http://core.svn.wordpress.org/trunk@37375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-10 11:45:42 +00:00
Dominik Schilling
5f1ac9c96d Upgrader: Update wp-admin/includes/class-wp-upgrader-skins.php to require_once the new files added in [37406].
Part 3/8.
See #36618.
Built from https://develop.svn.wordpress.org/trunk@37408


git-svn-id: http://core.svn.wordpress.org/trunk@37374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-10 11:42:26 +00:00
Dominik Schilling
4b846677ba Upgrader: Update file headers and class DocBlocks for new files added in [37406].
Part 2/8.
See #36618.
Built from https://develop.svn.wordpress.org/trunk@37407


git-svn-id: http://core.svn.wordpress.org/trunk@37373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-10 11:31:28 +00:00
Dominik Schilling
bbecb1a485 Upgrader: Copy WP_Upgrader_Skin and its subclasses into one file per class.
Part 1/8.
See #36618.
Built from https://develop.svn.wordpress.org/trunk@37406


git-svn-id: http://core.svn.wordpress.org/trunk@37372 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-10 11:11:30 +00:00
Jeremy Felt
ced66ed4e7 Multisite: Use the admin-multisite Dashicon for sites
This icon was added to Dashicons in 4.3, but not applied to anything in our CSS.

Uses the more appropriate `dashicons-admin-multisite` when displaying the sites menu item.

Props Ipstenu, ocean90.
Fixes #36754.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-05 17:13:26 +00:00
Jeremy Felt
db3d5a6bea Revert [37362], which incorrectly changed Dashicons CSS
`dashicons.css` is an external-ish library and the change there is incorrect.

See #36754.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-05 15:29:27 +00:00
Helen Hou-Sandí
610215ceb1 Revive grunt-rtlcss, which does not appear to enjoy syntax errors.
props netweb.
see #36753, #29792.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-05 15:22:27 +00:00
Jeremy Felt
172af4e0ce Multisite: Use the admin-multisite Dashicon in the admin menu and bar
This icon was added to Dashicons in 4.3, but not applied to anything in our CSS.

Props Ipstenu.
Fixes #36754.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37328 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-05 04:29:26 +00:00
Helen Hou-Sandí
a800cf654b Drop Open Sans in the admin in favor of system fonts.
Rejoice, for your admins will feel more native to your surrounding computing environment and likely load faster, especially when offline, as they no longer have to talk to The Google Overlord.

At the time of introduction in 3.8, there were not good system fonts common to all platforms at the time. In the years since, Windows, Android, OS X, iOS, Firefox OS, and various flavors of Linux have all gotten their own (good) system UI fonts.

There will definitely be visual bugs, mainly around alignment and spacing; these should be documented and reported on the ticket and fixed more atomically so that our current and future selves have a better understanding of what happened and why.

The style remains registered, as it is almost certainly in use by themes and plugins.

props mattmiklic.
see #36753.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-04 22:07:37 +00:00
Drew Jaynes
ebfc1467bb Links: Rename the $link_id parameter in get_link_to_edit() to $link to better reflect that it can accept a link ID or object.
Props tloureiro for the initial patch.
Fixes #36736.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-02 23:43:27 +00:00
Drew Jaynes
3470faa683 Links: Clarify documentation for the $link_id parameter to mention that it accepts either an integer or object.
Props tloureiro.
See #36736.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37317 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-02 23:40:27 +00:00
Weston Ruter
3a37220f2a Customize: Allow Esc key to collapse the currently-expanded panel, section (or control).
Pressing Esc collapses any expanded widget or nav menu item controls, or any control that implements the expanding interface. Also improves alignment between `WidgetControl` and `MenuItemControl`, adding the `expanded` state and associated `expand`/`collapse` methods to nav menu items.

Props purcebr, celloexpressions, westonruter.
Fixes #22237.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-02 19:52:28 +00:00