WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,002 Commits 50 Branches 749 Tags 982 MiB
Commit Graph

14978 Commits

Author SHA1 Message Date
Sergey Biryukov dfc4654172 Dashboard: Display year in Activity widget if the post date year is not the same as the current one. 
Props GaryJ, chriscct7.
Fixes #26502.
Built from https://develop.svn.wordpress.org/trunk@34980


git-svn-id: http://core.svn.wordpress.org/trunk@34945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-09 04:26:24 +00:00
Sergey Biryukov 6595b1b080 My Sites: Make "Create a New Site" link consistent with other "Add New" links. 
Props JeffMatson.
Fixes #34179.
Built from https://develop.svn.wordpress.org/trunk@34979


git-svn-id: http://core.svn.wordpress.org/trunk@34944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-09 03:50:24 +00:00
Sergey Biryukov 3c7b7f7133 After [34529], if a compatible `termmeta` table is found on database upgrade, convert it to `utf8mb4` collation. 
Props dboulet.
Fixes #34224.
Built from https://develop.svn.wordpress.org/trunk@34978


git-svn-id: http://core.svn.wordpress.org/trunk@34943 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-09 02:07:25 +00:00
Andrew Ozz a6cf0b41a6 JS: in event callbacks replace the very outdated `return false` with `preventDefault()`. 
Props adamsilverstein.
Fixes #18590.
Built from https://develop.svn.wordpress.org/trunk@34977


git-svn-id: http://core.svn.wordpress.org/trunk@34942 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-09 01:27:27 +00:00
Helen Hou-Sandí b23005d7c1 Revisions: Update slider handle styling. 
This brings them in line with updated buttons as done in [34948] for #31459. It also gives it secondary action styling as opposed to primary, as restoring is considered the primary action.

props hugobaeta.
fixes #34220.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34941 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-09 00:25:25 +00:00
John Blackbourn 44da78be26 Remove HTML escaping for the plugin name and author fields that are displayed when deleting a plugin. 
While it might seem counter-intuitive to remove HTML escaping, these fields are already safe (they originate in `_get_plugin_data_markup_translate()` which handles sanitization and escaping), and the AuthorName field actually allows some HTML. This change prevents escaped HTML from appearing here.

Fixes #25422

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


git-svn-id: http://core.svn.wordpress.org/trunk@34938 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-08 23:13:24 +00:00
John Blackbourn b62e798c17 Introduce the ability to filter the Users admin listing screen by users with no role, if such users exist. 
Fixes #22993
Props spmlucas, johnbillion

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


git-svn-id: http://core.svn.wordpress.org/trunk@34930 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-08 22:07:47 +00:00
John Blackbourn 1451ebc0d1 On the Users list table, show all the roles of a user in a comma-separated list if they have more than one role. This prevents role obfuscation in situations where a user has had more than one role programmatically assigned to them. 
Fixes #22959
Props scribu, JustinSainton, DrewAPicture, johnbillion

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


git-svn-id: http://core.svn.wordpress.org/trunk@34928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-08 21:59:25 +00:00
Drew Jaynes a07cd8b386 Docs: Normalize documentation spacing in the DocBlocks for `add_meta_box()` and `remove_meta_box()` following [34951]. 
Fixes #15000.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34917 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-08 19:13:24 +00:00
Drew Jaynes 6e4268e6fa Administration: Add the ability to pass an array of screen IDs to `add_meta_box()` and `remove_meta_box()`. 
The `$screen` parameter in both functions can now accept a single screen ID, `WP_Screen` object, or an array of screen IDs.

Adds tests.

Props coffee2code, iamfriendly, madalinungureanu, mordauk, igmoweb, meloniq, DrewAPicture.
See #15000.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34916 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-08 19:07:24 +00:00
Helen Hou-Sandí 5b40bd827c Buttons: Update styles and colors. 
* Aligns with the color standards. See https://make.wordpress.org/design/handbook/foundations/colors/
* Creates a consistent interaction experience between states.
* Improves contrast and accessibility.

props hugobaeta, afercia, melchoyce, michael-arestad.
fixes #31459.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34913 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-08 17:31:24 +00:00
Dominik Schilling f8c467e07a Term Meta: Prevent a "Multiple primary key defined" error during database upgrades. 
You must have two spaces between the words `PRIMARY KEY` and the definition of your primary key. Yes, seriously.

See [34529].
Fixes #34210.
Built from https://develop.svn.wordpress.org/trunk@34936


git-svn-id: http://core.svn.wordpress.org/trunk@34901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-08 11:09:26 +00:00
John Blackbourn 0e1ecdcbf3 Revert [34917] until the broken test is fixed. 
See #13382

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


git-svn-id: http://core.svn.wordpress.org/trunk@34890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-08 01:04:25 +00:00
Boone Gorges b0e0323337 Add tests for `update_user_caches()`. 
See #24635.
Built from https://develop.svn.wordpress.org/trunk@34918


git-svn-id: http://core.svn.wordpress.org/trunk@34883 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-07 22:35:26 +00:00
Andrea Fercia 17f53091ed Bump H3 headings to H2 on the Network Admin > Sites > Edit Site screens. 
The navigation tabs appear in an `<h3>` heading immediately following the main `<h1>` and need to have a proper hierarchy.
Also, fix the tabs focus style and introduce a new `.nav-tab-small` CSS class.

Fixes #34079.
Built from https://develop.svn.wordpress.org/trunk@34913


git-svn-id: http://core.svn.wordpress.org/trunk@34878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-07 17:35:24 +00:00
Jeremy Felt 9926983b66 Revert [34778], continue using `_site_option()` for the current network. 
The `_network_option()` parameter order will be changing to accept `$network_id` first. The `_site_option()` functions will remain in use throughout core as our way of retrieving a network option for the current network.

See #28290.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-07 17:11:25 +00:00
Drew Jaynes feb2267a13 Docs: Improve documentation for `post_submit_meta_box()`, which serves as the display callback for the 'Publish' meta box. 
* `$post` is now correctly defined as being of the `WP_Post` type
* Adds a hash notation for the `$args` array
* Other minor fixes.

Props drebbitsweb.
Fixes #34171.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34876 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-07 16:34:24 +00:00
Scott Taylor a1ead3c7e3 List Tables: in `_WP_List_Table_Compat::get_column_info()`, also return `$primary`, which is expected since [33016]. 
Props tyxla.
Fixes #34148.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34862 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-07 03:12:24 +00:00
Scott Taylor ae813883f5 Meta Boxes: add an action, `post_submitbox_minor_actions`. `post_submitbox_misc_actions` already exists. Pass `$post` to both for context - avoids having to check for a global post. 
Props jonathanbardo, chriscct7, DrewAPicture.
Fixes #26267.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-07 02:45:25 +00:00
Scott Taylor 2783773775 Meta Boxes: reboot some of the code in `postbox.js` to support `aria-expanded` attribute toggling and to properly reference static class properties. 
Props afercia, wonderboymusic.
Fixes #33754.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-07 01:58:25 +00:00
Scott Taylor a3ec4d45f3 List Tables: after [34276], decrease horizontal padding for sorted column headers (causing weirdness in the Count column of tax list tables) - the vertical padding change suffices in fixing the original issue. 
Fixes #27945.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-07 01:40:24 +00:00
Scott Taylor 0c2b2a0e3d List Tables/WP_Screen: in `WP_Screen`, add methods to store, retrieve, and render screen reader text, primarily used by list table screens. 
These additions are based on an audit and recommendations by the Accessibility team. #a11y'all

Props afercia.
Fixes #32147.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34856 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-07 01:28:25 +00:00
Scott Taylor 7547dc5125 Posts List Table: ensure that "All" gets the "current" CSS class when applicable. 
Props afercia.
Fixes #19609.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-07 00:09:24 +00:00
Weston Ruter aa044b054e Customizer: Ensure that `wp.customize.Widgets.savedWidgetIds` is defined up front. 
In 4.3 the widget controls were fully initialized up front along with the sidebar controls. The sidebar control depended (unnecessarily) on the widget control to ensure that `wp.customize.Widgets.savedWidgetIds` was defined. So after [34563] there could be a situation where the widgets are added/removed from a sidebar before their controls are initialized (if the sidebar section is never expanded), resulting in an error attempting to get a property off of an undefined value. So this change does the right thing and defines `savedWidgetIds` up front.

Also changes the `savedWidgetIds` variable type from an array to an object, to match how it is used as a dictionary lookup.

See #33901.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 21:59:25 +00:00
Dominik Schilling 0bc1d84fc7 MS Themes List Table: Fix inverted logic for displaying the "No items" message. 
Fixes #25464.
Built from https://develop.svn.wordpress.org/trunk@34873


git-svn-id: http://core.svn.wordpress.org/trunk@34838 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 17:35:23 +00:00
Scott Taylor 2d1fff2c75 Setup/Config: some `dirname( ABSPATH )` file lookups should have errors suppressed due to possibility of `open_basedir` restrictions on hosts. 
Props chriscct7, misterunknown.
Fixes #29680.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34832 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 14:20:25 +00:00
Scott Taylor ddbd67a22e Media: in `wp_read_video|audio_metadata()`, set `GETID3_TEMP_DIR` to `get_temp_dir()` if it is not defined. This is a workaround for when `safe_mode` is enabled pre-PHP 5.3. 
Props chriscct7, tomsommer.
Fixes #26265.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 14:14:25 +00:00
Scott Taylor c5475fbfc2 Admin Menu: remove duplicated separators, and use `strpos()` (instead of `strcmp()`) when determining if the separator CSS class is present. 
Props rilwis, chriscct7.
Fixes #24104.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34826 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 13:46:25 +00:00
Drew Jaynes 65133a89c1 Multisite: Introduce `get_subdirectory_reserved_names()`, which returns a filterable list of reserved subdirectory site names. 
The function encapsulates the existing `subdirectory_reserved_names` filter and reduces the maintenance burden of keeping the value of (currently) two instances of the same hook in sync.

See #33615.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 04:35:25 +00:00
Scott Taylor 3ef27f7929 oEmbed: add `embed` to `$subdirectory_reserved_names`. 
Props jeremyfelt.
See #32522.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34815 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-06 03:45:25 +00:00
Dominik Schilling fcc36d1adf Media List Table: Remove the date display in `column_parent()`. 
It should be the time at which the post was written, but it was never because of the missing `$parent` argument.

Fixes #33238.
Built from https://develop.svn.wordpress.org/trunk@34839


git-svn-id: http://core.svn.wordpress.org/trunk@34804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 22:25:26 +00:00
John Blackbourn 1e90e58da3 Correct pagination when viewing the 'Mine' link on the post listing screen. 
Fixes #19609
Props ocean90

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


git-svn-id: http://core.svn.wordpress.org/trunk@34802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 21:36:25 +00:00
Weston Ruter 31a394fcf7 Customizer: Reset horizontal scroll position when finished dragging a nav menu item. 
Props karinedo, austinginder, adamsilverstein, tyxla.
Fixes #33367.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34799 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 20:46:27 +00:00
Helen Hou-Sandí 60431ae239 Permalinks: Slightly lengthen the truncated slug for display. 
This brings it closer to the width of the input so there is less jumping around of buttons. We can afford the space now that other buttons in the space are typically no longer there.

fixes #18306.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 19:29:24 +00:00
Drew Jaynes 3f747a6395 Revisions: Also pass the `$revision` post object to the `wp_prepare_revision_for_js` filter, introduced in [34541]. 
Props helen.
Fixes #28627.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34797 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 18:33:28 +00:00
Drew Jaynes a134491455 Docs: Document the `$revision_data` parameter passed to the `wp_prepare_revision_for_js` filter with a hash notation. 
The hook was introduced in [34541].

See #28627.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 18:03:26 +00:00
Weston Ruter 31d02887b6 Customizer: Fix moving focus to available nav menu items search. 
Fixes regression introduced in [34219].

Props tyxla.
See #33360.
Fixes #34125 for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 15:27:24 +00:00
Boone Gorges 0e7c1d3b14 Use `wp_installing()` instead of `WP_INSTALLING` constant. 
The `WP_INSTALLING` constant is a flag that WordPress sets in a number of
places, telling the system that options should be fetched directly from the
database instead of from the cache, that WP should not ping wordpress.org for
updates, that the normal "not installed" checks should be bypassed, and so on.

A constant is generally necessary for this purpose, because the flag is
typically set before the WP bootstrap, meaning that WP functions are not yet
available.  However, it is possible - notably, during `wpmu_create_blog()` -
for the "installing" flag to be set after WP has already loaded. In these
cases, `WP_INSTALLING` would be set for the remainder of the process, since
there's no way to change a constant once it's defined. This, in turn, polluted
later function calls that ought to have been outside the scope of site
creation, particularly the non-caching of option data. The problem was
particularly evident in the case of the automated tests, where `WP_INSTALLING`
was set the first time a site was created, and remained set for the rest of the
suite.

The new `wp_installing()` function allows developers to fetch the current
installation status (when called without any arguments) or to set the
installation status (when called with a boolean `true` or `false`). Use of
the `WP_INSTALLING` constant is still supported; `wp_installing()` will default
to `true` if the constant is defined during the bootstrap.

Props boonebgorges, jeremyfelt.
See #31130.
Built from https://develop.svn.wordpress.org/trunk@34828


git-svn-id: http://core.svn.wordpress.org/trunk@34793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 15:06:28 +00:00
Drew Jaynes aa6fbdaa92 Docs: Add a missing DocBlock summary for `wp_list_widget_controls_dynamic_sidebar()`. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 03:06:24 +00:00
Drew Jaynes b1b2ec30e2 Docs: Add missing DocBlock summaries for five functions in wp-admin/includes/template-functions.php. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34791 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 03:03:25 +00:00
Drew Jaynes 0b332f6d7a Docs: Add missing DocBlock summaries to three functions in wp-admin/includes/plugin.php. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34790 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 02:55:24 +00:00
Drew Jaynes 4c2203b370 Docs: Add missing summaries for functions in wp-admin/includes/misc.php. 
Also restructures the summary for `update_home_siteurl()`.

See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 02:52:24 +00:00
Drew Jaynes 2de4cc7149 Docs: Add missing DocBlock summaries for a multitude of functions in wp-admin/includes/media.php. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34788 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 02:44:25 +00:00
Drew Jaynes 3866a8cf58 Docs: Add missing method summaries for the deprecated `WP_User_Search` class, including `prepare_query()`, `query()`, `prepare_vars_for_template_usage()`, `do_paging()`, and `get_results()`. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34787 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 02:35:25 +00:00
Drew Jaynes 1f1c2335ad Docs: Add missing summaries for three deprecated admin functions: `dropdown_categories()`, `dropdown_link_categories()`, and `wp_dropdown_cats()`. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34786 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-05 02:29:26 +00:00
Drew Jaynes 6650dfea4f Docs: Document the plugin data array returned by `get_plugin_data()` with a hash-notation. 
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34783 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-04 19:06:27 +00:00
Drew Jaynes b453c9e976 Users: Don't pass the current `WP_Users_List_Table` or `WP_MS_Users_List_Table` instance to the `users_list_table_query_args` filter after all. 
After some discussion, it was decided that Multisite vs single site context can just as easily be derived using available functions like `is_network_admin()`, `get_current_screen()`, etc., rendering the second parameter moot. The hook was introduced in [34796].

Fixes #25360.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34778 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-03 21:49:24 +00:00
Sergey Biryukov 6b71b2304b Merge some strings in `wp-admin/upload.php` with existing strings with the same meaning. 
Props pavelevap.
Fixes #31727.
Built from https://develop.svn.wordpress.org/trunk@34797


git-svn-id: http://core.svn.wordpress.org/trunk@34762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-03 13:57:27 +00:00
Drew Jaynes b38569a5fc Users: Introduce the `users_list_table_query_args` filter, for modifying the `WP_User_Query` arguments used within the `prepare_items()` methods in the users list tables. 
The current list table is passed as a second parameter, `$this`, and can take the form of either a `WP_Users_List_Table` or `WP_MS_Users_List_Table` instance depending on the context in which the filter was evaluated.

Props juliobox for the initial patch.
Fixes #25360.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-03 07:24:25 +00:00
Sergey Biryukov d6865505d5 Respect the `force_delete` parameter of `get_delete_post_link()`. 
Previously, it only worked if `EMPTY_TRASH_DAYS` was disabled.

Props johnbillion, chriscct7.
Fixes #26832.
Built from https://develop.svn.wordpress.org/trunk@34794


git-svn-id: http://core.svn.wordpress.org/trunk@34759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-03 01:50:25 +00:00