Eric Lewis
d6a377acdc
Build/Test Tools: Document `WP_UnitTestCase->go_to()`
...
Fixes #36679 .
Built from https://develop.svn.wordpress.org/trunk@37319
git-svn-id: http://core.svn.wordpress.org/trunk@37285 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-27 18:25:29 +00:00
Jeremy Felt
0df948da2d
Tests: Reduce unnecessary count in `create_many()` in multisite user tests
...
The tests for `is_blog_user()` and `is_user_member_of_blog()` should be refactored. Until then, we can shave several seconds from the test time by avoiding unnecessary loops of the same tests.
See #36566 .
Built from https://develop.svn.wordpress.org/trunk@37318
git-svn-id: http://core.svn.wordpress.org/trunk@37284 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-27 06:33:27 +00:00
Jeremy Felt
6226af307b
Users: Prevent spammy users from resetting their passwords in multisite
...
Props r-a-y, websupporter.
Fixes #24617 .
Built from https://develop.svn.wordpress.org/trunk@37317
git-svn-id: http://core.svn.wordpress.org/trunk@37283 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-27 05:55:27 +00:00
Jeremy Felt
98d8ad680b
Users: Provide a full user object when checking for a spammy multisite user
...
`is_user_spammy()` falls back to the current user if one is not provided. There is no current user during authentication, so the result is always `false`. Pass a user to fill the void.
Adds tests for `wp_authenticate_spam_check()`.
Props websupporter.
Fixes #36546 .
Built from https://develop.svn.wordpress.org/trunk@37316
git-svn-id: http://core.svn.wordpress.org/trunk@37282 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-27 05:36:28 +00:00
Eric Lewis
02a4e761f2
Users: Correct inline docs for cookie expiration.
...
Props kjbenk.
Fixes #35568 .
Built from https://develop.svn.wordpress.org/trunk@37315
git-svn-id: http://core.svn.wordpress.org/trunk@37281 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-27 02:52:28 +00:00
Rachel Baker
56c18bb5af
Users: Remove the “Name” column of the Users table from appearing sortable.
...
The “Name” column of the Users WP List Table is not sortable because this column displays a concatenation of two optional values, `first_name` and `last_name`. Even if WP_User_Query supported ordering queries in this manner, the resulting sequence would be chaotic.
Fixes #28064 .
Props jesin, and rachelbaker.
Built from https://develop.svn.wordpress.org/trunk@37314
git-svn-id: http://core.svn.wordpress.org/trunk@37280 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-26 20:35:29 +00:00
Rachel Baker
ddbde15454
Post Thumbnails: Fix logic bug and tests from [37308] where post-thumbnails support wasn’t added if there were no previous post_types with support already.
...
See #22080
Built from https://develop.svn.wordpress.org/trunk@37313
git-svn-id: http://core.svn.wordpress.org/trunk@37279 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-26 20:29:27 +00:00
Rachel Baker
e510918b4e
Tests: Fix typo `current_theme_support()` -> `current_theme_supports()` from [37308]
...
Built from https://develop.svn.wordpress.org/trunk@37309
git-svn-id: http://core.svn.wordpress.org/trunk@37275 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-26 17:31:29 +00:00
Rachel Baker
af5c5a9a25
Post Thumbnails: When using `add_theme_support( ‘post-thumbnails’, array( $post_types) )` merge the supported post_types.
...
Allow the adding of post-thumbnail support for one or more post_types without unsetting any previously added post_types. This matches the behavior of other uses of `add_theme_support()` and the expectations of a function with a prefix of “add”.
To unset post-thumbnail support use `remove_theme_support()` instead.
Fixes #22080
Props alexkingorg, jmichaelward, and flixos90.
Built from https://develop.svn.wordpress.org/trunk@37308
git-svn-id: http://core.svn.wordpress.org/trunk@37274 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-26 17:05:31 +00:00
Sergey Biryukov
f3b7842281
Build/Test Tools: Reset the PHPMailer mock in `Tests_Mail::tearDown()`.
...
Props welcher.
Fixes #36609 .
Built from https://develop.svn.wordpress.org/trunk@37307
git-svn-id: http://core.svn.wordpress.org/trunk@37273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-23 08:16:29 +00:00
Scott Taylor
be6a91bf58
Unit Tests: prevent rewrite spillage from `@group author` unit tests.
...
See #36587 .
Built from https://develop.svn.wordpress.org/trunk@37306
git-svn-id: http://core.svn.wordpress.org/trunk@37272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 23:48:27 +00:00
Scott Taylor
8ec77ea445
Comments: add a `$comment` parameter to `get_comment_author_url_link()`.
...
Add unit tests (none exist).
Props flixos90, wonderboymusic.
Fixes #36573 .
Built from https://develop.svn.wordpress.org/trunk@37305
git-svn-id: http://core.svn.wordpress.org/trunk@37271 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 22:45:27 +00:00
Rachel Baker
e02de569a6
Comments: Add unordered list styling to Comments List Table rows and Moderate Comment screen.
...
Fixes #36160
Props juanfra.
Built from https://develop.svn.wordpress.org/trunk@37304
git-svn-id: http://core.svn.wordpress.org/trunk@37270 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 21:47:26 +00:00
Rachel Baker
8b0e1859bc
Comments: Keep comments safe in the Edit Post screen.
...
Warns users that have added a new Comment or began editing an existing without saving their changes, before they press the “update” button which would wipe out their comment changes.
Fixes #32818 .
Props polevaultweb.
Built from https://develop.svn.wordpress.org/trunk@37303
git-svn-id: http://core.svn.wordpress.org/trunk@37269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 21:43:28 +00:00
Scott Taylor
be59d289b7
Dashboard: toggle the "View" link for comments when Approving / Unapproving from the Dashboard widget.
...
Fixes #35518 .
Built from https://develop.svn.wordpress.org/trunk@37302
git-svn-id: http://core.svn.wordpress.org/trunk@37268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 21:30:28 +00:00
Andrew Ozz
59d388038e
TinyMCE: prevent showing the placeholder URL when adding a link and clicking more than once on the Insert Link button.
...
Props iseulde.
Fixes #36637 for trunk.
Built from https://develop.svn.wordpress.org/trunk@37301
git-svn-id: http://core.svn.wordpress.org/trunk@37267 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 19:11:28 +00:00
Jeremy Felt
0fd08986dd
Tests: Account for flexible IDs in main network deletion test
...
After [37299], the network IDs encountered by this test may be larger than "100".
This adjusts the test to respond accordingly until we have a better way to delete networks.
See #36566 .
Built from https://develop.svn.wordpress.org/trunk@37300
git-svn-id: http://core.svn.wordpress.org/trunk@37266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 15:22:27 +00:00
Boone Gorges
269c9fe421
Tests: Use the same incrementor for all fields belonging to a given text fixture.
...
[35244] changed the way that `WP_UnitTest_Generator_Sequence()` created an
incrementor for object fields (like 'post_name' and 'user_email'), by making
incrementor static across the entire run of the test suite. While this helped
to enforce uniqueness across the tests, it has the side effect of bumping the
incrementor between fields on the same object (so that, eg, the same post might
have `post_name` "post-12" but `post_title` "Post 13". By switching to a
technique that uses the same incrementor for each field belonging to a given
fixture, we conform better to the expectations of developers using
`WP_UnitTest_Factory`.
Fixes #35199 .
Built from https://develop.svn.wordpress.org/trunk@37299
git-svn-id: http://core.svn.wordpress.org/trunk@37265 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 14:36:29 +00:00
Gary Pendergast
cb7ea89c8e
Smilies: Move `convert_smilies` to happen later in the `the_content` filter.
...
In particular, we want it to occur after shortcode handling. The smiley conversion routine doesn't have any concept of shortcode structure, so may inadvertantly replace a smiley with HTML inside a shortcode attribute, which will cause the shortcode to not be parsed correctly.
Props Unyson for the initial suggested fix.
Fixes #36306 .
Built from https://develop.svn.wordpress.org/trunk@37298
git-svn-id: http://core.svn.wordpress.org/trunk@37264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 07:08:27 +00:00
Sergey Biryukov
45b7930627
Text Changes: Consistently refer to https://wordpress.org/plugins/ and https://wordpress.org/themes/ as WordPress Plugin Directory and WordPress Theme Directory, respectively.
...
Props mpol.
Fixes #35938 .
Built from https://develop.svn.wordpress.org/trunk@37297
git-svn-id: http://core.svn.wordpress.org/trunk@37263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 06:57:26 +00:00
Gary Pendergast
33cb1be012
Emoji: The `:roll:` smiley is now an emoji.
...
Unicode 8 added `U+1F644`, "Face with Rolling Eyes", which matches our `:roll:` smiley. Continuing our ever present quest to rid the world of legacy smilies, we now translate that smiley into its emoji form.
Sadly, `:mrgreen:` remains sorely under-represented in the Unicode standard, I'm inclined to think that we should buy a voting membership of the Unicode Consortium, in order to rectify that situation. (Personally, I'm hoping for a green skin tone modifier.)
Fixes #36365 .
Built from https://develop.svn.wordpress.org/trunk@37296
git-svn-id: http://core.svn.wordpress.org/trunk@37262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 06:29:27 +00:00
Gary Pendergast
b45e906927
Database: Suppress connection error messages when `WP_DEBUG` isn't enabled.
...
This is a partial revert of [35860], which has been causing un-catchable warnings to be generated on some server configurations.
Fixes #36629 for trunk.
See #21870 .
Built from https://develop.svn.wordpress.org/trunk@37292
git-svn-id: http://core.svn.wordpress.org/trunk@37258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-22 05:19:27 +00:00
Dominik Schilling
c3fe61770c
Media: Remove an extra quote when sending a link of a media file to the editor.
...
Introduced in [37035].
Props joemcgill, swissspidy, boonebgorges.
Fixes #36578 .
Built from https://develop.svn.wordpress.org/trunk@37288
git-svn-id: http://core.svn.wordpress.org/trunk@37254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 21:21:28 +00:00
Dominik Schilling
93eaf20f29
Themes: Update list of WordPress theme features.
...
* Remove color tags.
* Layout: Add Grid Layout, remove Fixed Layout, Fluid Layout, and Responsive Layout.
* Features: Add Footer Widgets, remove Blavatar.
* Subject: Add Blog, E-Commerce, Education, Entertainment, Food & Drink, Holiday, News, Photography and Portfolio, remove Photoblogging and Seasonal.
Props grapplerulrich, davewarfel.
Fixes #33407 .
Built from https://develop.svn.wordpress.org/trunk@37287
git-svn-id: http://core.svn.wordpress.org/trunk@37253 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 21:11:29 +00:00
Dominik Schilling
3df07b17dd
Media: Don't cache the results of `wp_mkdir_p()` in a persistent cache.
...
To improve the performance of `wp_upload_dir()` the result of `wp_mkdir_p()` was stored in a persistent cache, introduced in [36565]. But this becomes an issue when WordPress is scaled horizontally. You may end up caching a value for a server where the directory doesn't exist which will prevent further uploads on other servers because of the persistent cache.
The fix is to use a non-persistent cache.
Props azaozz, ocean90.
See #34359 .
Fixes #36621 .
Built from https://develop.svn.wordpress.org/trunk@37285
git-svn-id: http://core.svn.wordpress.org/trunk@37251 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 19:58:27 +00:00
Weston Ruter
959f1a07a6
Customize/Formatting: Move `sanitize_hex_color()`, `sanitize_hex_color_no_hash()`, and `maybe_hash_hex_color()` from `class-wp-customize-manager.php` into `formatting.php`.
...
Adds missing braces.
See #33413 .
Props downstairsdev, tollmanz.
Fixes #27583 .
Built from https://develop.svn.wordpress.org/trunk@37283
git-svn-id: http://core.svn.wordpress.org/trunk@37249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 19:22:27 +00:00
John Blackbourn
a58ec423da
Feeds: Revert [36230] which removed the `rss-http` feed content type. Removing this means that any feeds which are using this feed content type are now being served as `application/octet-stream` instead of `text/xml`.
...
See #36620
Built from https://develop.svn.wordpress.org/trunk@37282
git-svn-id: http://core.svn.wordpress.org/trunk@37248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 18:57:28 +00:00
Sergey Biryukov
cf12011934
Docs: Move the clarification of `is_tax()` and `WP_Query::is_tax()` return value added in [37235] to `@return` description.
...
Props DrewAPicture.
Fixes #36331 .
Built from https://develop.svn.wordpress.org/trunk@37281
git-svn-id: http://core.svn.wordpress.org/trunk@37247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 17:47:28 +00:00
Boone Gorges
da08f6a3de
Tests: More explicit fixture content when testing `s=0` query string.
...
After [36647], the unit test generator sequence can put a 0 into the
'post_excerpt' field of a post fixture, causing false positives.
See [36520] for a parallel fix involving 'post_content'.
Fixes #36622 .
Built from https://develop.svn.wordpress.org/trunk@37280
git-svn-id: http://core.svn.wordpress.org/trunk@37246 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 15:53:27 +00:00
Sergey Biryukov
1bd88850f7
Administration: Introduce `admin_print_footer_scripts-$hook_suffix"`, a dynamic version of the `admin_print_footer_scripts` hook.
...
This is now more consistent with the generic `admin_print_scripts` and the dynamic `admin_print_scripts-$hook_suffix` hooks fired in `wp-admin/admin-header.php`.
Props tfrommen.
Fixes #34334 .
Built from https://develop.svn.wordpress.org/trunk@37279
git-svn-id: http://core.svn.wordpress.org/trunk@37245 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 15:17:27 +00:00
Sergey Biryukov
31b896d1aa
Docs: Reflect the new `'user'` option for `wp_new_user_notification()`'s `$notify` parameter added in [37276] in `wp_send_new_user_notifications()` docs as well.
...
Props ocean90.
Fixes #36009 .
Built from https://develop.svn.wordpress.org/trunk@37278
git-svn-id: http://core.svn.wordpress.org/trunk@37244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 12:01:27 +00:00
Sergey Biryukov
d42602334f
Users: Add a unit test for [37276].
...
See #36009 .
Built from https://develop.svn.wordpress.org/trunk@37277
git-svn-id: http://core.svn.wordpress.org/trunk@37243 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 11:52:27 +00:00
Sergey Biryukov
c371296223
Users: In `wp_new_user_notification()`, sdd `'user'` option for the `$notify` parameter, which allows for sending notification only to the user created.
...
Props akibjorklund.
Fixes #36009 .
Built from https://develop.svn.wordpress.org/trunk@37276
git-svn-id: http://core.svn.wordpress.org/trunk@37242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 10:20:27 +00:00
Pascal Birchler
a47fa4f197
Rewrite Rules: After [36953], correctly replace existing rules on IIS when updating them.
...
Props WiZZarD_.
Fixes #36506 for trunk.
Built from https://develop.svn.wordpress.org/trunk@37273
git-svn-id: http://core.svn.wordpress.org/trunk@37239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 09:33:27 +00:00
Dominik Schilling
7b03510520
Upgrader: Clear plugin/theme caches directly after a plugin/theme has been updated.
...
`wp_update_plugins()` and `wp_update_themes()` are both hooked into `upgrader_process_complete` with priority 10. But at this stage the caches in `get_plugins()`, `search_theme_directories()`, and `wp_get_themes()` aren't refreshed yet so both functions couldn't fetch any translations for the new plugin/theme.
To reset the caches, `wp_clean_themes_cache()` and `wp_clean_plugins_cache()` are now hooked into `upgrader_process_complete` with priority 9.
This is a follow-up to [34751].
See #34029 .
Fixes #36383 .
Built from https://develop.svn.wordpress.org/trunk@37272
git-svn-id: http://core.svn.wordpress.org/trunk@37238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 09:09:28 +00:00
Drew Jaynes
7c5f77ece3
Tests: Pre-declare the `$year_url` property before initialization in `Tests_Get_Archives::setUp()`.
...
Props pbearne.
Fixes #36611 .
Built from https://develop.svn.wordpress.org/trunk@37271
git-svn-id: http://core.svn.wordpress.org/trunk@37237 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 02:56:26 +00:00
Drew Jaynes
852e6921d2
Docs: Add missing return descriptions for `WP_Filesystem_SSH2::chown()` and `WP_Filesystem_SSH2::run_command()`.
...
Fixes #30989 .
Built from https://develop.svn.wordpress.org/trunk@37270
git-svn-id: http://core.svn.wordpress.org/trunk@37236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 02:38:29 +00:00
Jeremy Felt
bfaad85d86
Tests: Exclude `ms-files` test group from default PHPUnit config
...
Multisite specific tests run as normal with `phpunit.xml.dist` and multisite constants defined. The `ms-files` group causes pollution when mixed with the rest of the tests, so it should be excluded here too.
See #36566 .
Built from https://develop.svn.wordpress.org/trunk@37269
git-svn-id: http://core.svn.wordpress.org/trunk@37235 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 17:11:27 +00:00
Aaron Jorbin
fd4829b1a5
Don't announce PR builds in Slack
...
People may submit a PR to our travis build repo, we shouldn't notify slack when that happens.
See https://docs.travis-ci.com/user/notifications/#Slack-notifications
Fixes #36607
Built from https://develop.svn.wordpress.org/trunk@37268
git-svn-id: http://core.svn.wordpress.org/trunk@37234 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 17:09:27 +00:00
Jeremy Felt
380128e053
Tests: Add speedTrapListener to multisite's PHPUnit config
...
See #36566 , #30017 .
Built from https://develop.svn.wordpress.org/trunk@37267
git-svn-id: http://core.svn.wordpress.org/trunk@37233 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 17:02:27 +00:00
Jeremy Felt
285d3406f8
Tests: Allow override of `MULTISITE` and `SUBDOMAIN_INSTALL` constants
...
Props rmccue.
Fixes #36567 .
Built from https://develop.svn.wordpress.org/trunk@37266
git-svn-id: http://core.svn.wordpress.org/trunk@37232 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 16:52:29 +00:00
Drew Jaynes
3e2e0c52e6
Docs: Clarify the return descriptions for `get_the_time()`, `get_post_time()`, and `get_post_modified_time()` to specify when an integer in the form of a Unix timestamp should be expected.
...
See [30674]. See #30989 .
Built from https://develop.svn.wordpress.org/trunk@37265
git-svn-id: http://core.svn.wordpress.org/trunk@37231 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 15:55:28 +00:00
Drew Jaynes
ddd3daf5ad
Docs: Clarify return descriptions in the DocBlocks for `set_user_setting()` and `delete_user_setting()`.
...
See [32613]. See #30989 .
Built from https://develop.svn.wordpress.org/trunk@37264
git-svn-id: http://core.svn.wordpress.org/trunk@37230 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 15:47:26 +00:00
Drew Jaynes
14a399b69a
Docs: Clarify parameter and return descriptions in the DocBlock for `wp_set_all_user_settings()`.
...
See [32613]. See #30989 .
Built from https://develop.svn.wordpress.org/trunk@37263
git-svn-id: http://core.svn.wordpress.org/trunk@37229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 15:45:29 +00:00
Boone Gorges
c8325e1ab5
Canonical: Use `get_the_terms()` to verify that a post belongs to the requested `%category%`.
...
The `get_the_terms()` wrapper provides cache support, and saves a database hit
on sites with a persistent cache backend.
Props spacedmonkey.
Fixes #36602 .
Built from https://develop.svn.wordpress.org/trunk@37262
git-svn-id: http://core.svn.wordpress.org/trunk@37228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 15:35:27 +00:00
Boone Gorges
9d9c6f3016
Tests: After [37260], use WP's `setUpBeforeClass()` wrappers.
...
This ensures no leakage between tests of fixture IDs.
See #36602 .
Built from https://develop.svn.wordpress.org/trunk@37261
git-svn-id: http://core.svn.wordpress.org/trunk@37227 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 15:31:28 +00:00
Boone Gorges
ba6525b1fe
Add tests for permastruct containing `/%category%/`.
...
See #36602 .
Built from https://develop.svn.wordpress.org/trunk@37260
git-svn-id: http://core.svn.wordpress.org/trunk@37226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 15:00:28 +00:00
Drew Jaynes
49e3bc83dd
Docs: Capitalize URL – an acronym for Uniform Resource Locator – when used in the context of inline docs in wp-includes/link-template.php.
...
Fixes #30406 .
Built from https://develop.svn.wordpress.org/trunk@37259
git-svn-id: http://core.svn.wordpress.org/trunk@37225 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 14:47:28 +00:00
Drew Jaynes
a368295c37
Docs: Notate more optional parameter defaults for a variety of function DocBlocks in wp-includes/link-template.php.
...
See #30406 .
Built from https://develop.svn.wordpress.org/trunk@37258
git-svn-id: http://core.svn.wordpress.org/trunk@37224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 14:37:29 +00:00
Gary Pendergast
b43ee4b8fe
Emoji: The diversity support test was incorrectly passing on all browsers.
...
[37028] missed some logic to capture the base emoji skin tone, to compare to the modified emoji skin tone. This caused all browsers to report that they supported skin tone modifiers, regardless of whether they actually did.
Fixes #36604 for trunk.
Built from https://develop.svn.wordpress.org/trunk@37256
git-svn-id: http://core.svn.wordpress.org/trunk@37222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-20 13:56:28 +00:00