Commit Graph

36253 Commits

Author SHA1 Message Date
Pascal Birchler
c25258a927 Customize: Harden site_icon control template to account for when full image size is missing.
Props aussieguy123, westonruter.
See #36749.
Fixes #40010.

Merges [40314] to the 4.7 branch.



git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40332 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-25 15:25:48 +00:00
Pascal Birchler
b10061bf8e Customize: Prevent links to customize.php from being generated which have query vars from wp_removable_query_args() present.
Props dlh.
See #23367, #32692.
Fixes #31850.

Merges [40313] to the 4.7 branch.



git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40331 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-25 13:34:27 +00:00
Pascal Birchler
0145add43a Posts, Post Types: Add missing REST API properties to WP_Post_Type class.
Props danielbachhuber.
Fixes #39986.

Merges [40302] to the 4.7 branch.



git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40329 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-24 19:04:26 +00:00
Pascal Birchler
12080c2497 Taxonomy: Add missing REST API properties to WP_Taxonomy class.
Props danielbachhuber.
Fixes #39987.

Merges [40303] to the 4.7 branch.



git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40328 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-24 19:03:14 +00:00
Pascal Birchler
8b0f76c917 List Tables: After [38703], [38706], and [40118], adjust the jQuery selector to make the selection of a range of checkboxes work again.
Unprop afercia.
Fixes #40056.

Merges [40268] to the 4.7 branch.



git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40327 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-24 18:49:07 +00:00
Pascal Birchler
e63968f21d Themes: Add filter for excluding directories from being scanned for template files.
Exclude 'node_modules' directories from paths searched in `WP_Theme::scandir()`. Introduces the `theme_scandir_exclusions` filter to allow sites to 
exclude any other paths like `bower_components` or `vendor` from being searched for template files.

Props lukasbesch, dd32, swisspidy, rachelbaker. 
Fixes #38292.

Merges [40301] to the 4.7 branch.



git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40326 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-24 18:43:13 +00:00
Pascal Birchler
d142d7fa23 REST API: Use get_gmt_from_date() when preparing a draft post for response.
This prevents wrong dates when dealing with DST, see [40115] and [40284].

Props nerrad.
Fixes #40136.

Merges [40284] and [40324] to the 4.7 branch.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40325 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-24 17:52:02 +00:00
John Blackbourn
8b23276a6a Login and Registration: Avoid a potentially incorrect value for the cookie hash on multisite installations that don't have a value in the siteurl network option.
This reverts [38619].

See #34084, #39497

Merges [40320] to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40321 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-23 19:02:23 +00:00
Boone Gorges
4eb0dcc64d Fix the formatting of $taxonomies parameter of 'wp_get_object_terms' filter.
[38667]  changed the way that the filter parameters are built. That
changeset didn't fully account for the pre-4.7 format of `$taxonomies`.

Merge of [40290] to the 4.7 branch.

Props ig_communitysites.
Fixes #40154.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40291 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-14 18:42:57 +00:00
John Blackbourn
b842d26924 Build/Test tools: Get Travis builds working on HHVM again.
This change moves to specifying the PHPUnit version for all PHP versions, and fixes an issue where the Composer global bin directory is not at `~/.composer/vendor/bin` on the boxes that are used for HHVM builds.

See #40100

Merges [40269] and [40271] to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40272 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-11 00:05:34 +00:00
John Blackbourn
ec70d962ca Build/Test tools: Don't override the wp_set_auth_cookie() and wp_clear_auth_cookie() functions.
Overriding pluggable functions in the test suite is asking for trouble in the future. In addition, it means the test suite can't be guaranteed to behave the same as core.

This instead introduces a `send_auth_cookies` filter which can be hooked in during the test suite to prevent these functions from attempting to send cookie headers to the client.

Fixes #39367

Merges [40263] and [40264]  to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40265 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-10 15:05:36 +00:00
Dominik Schilling (ocean90)
53058fc1b4 Build/Test Tools: Update .travis.yml to include latest improvements from trunk.
* Explicitly use PHPUnit 5.7 for the PHP 7 builds on Travis.
* On Travis CI install and use the node version which is specified in package.json.
* Add some more debugging to Travis and bring the format of the Xdebug fix inline with branches.

Merge of [40255] and [40257-40259] to the 4.7 branch.

Props netweb, johnbillion.
See #35105, #39822, #40086.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40260 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-09 22:01:32 +00:00
John Blackbourn
001cad9cf6 Build/Test tools: Remove the unnecessary clone of the twentysixteen repo.
This is no longer needed since #31550.

Fixes #40066

Merges [40252] to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40253 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-09 01:35:50 +00:00
John Blackbourn
ddf26b95ac Build/Test tools: In Travis, skip some tests when not on trunk.
This skips time sensitive tests (copyright year and PHP/MySQL version requirements) when tests are run on branches on Travis.

Props netweb, jorbin

Fixes #39486

Merges [40241] to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40250 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-08 00:51:22 +00:00
John Blackbourn
e220469859 Build/Test Tools: Call wp_head() and wp_footer() in the theme used during tests.
See #31550
Fixes #39988

Merges [40235] to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40236 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-07 01:34:43 +00:00
John Blackbourn
513cbb5c5e Build/Test Tools: Disable Xdebug when testing on Travis to increase performance.
See #39978


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40225 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-07 00:20:32 +00:00
Sergey Biryukov
c12b33e067 Post-4.7.3 version bump for 4.7 branch.
git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40224 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-06 18:51:44 +00:00
James Nylen
b101339531 Bump 4.7 branch to version 4.7.3.
git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40202 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-06 15:55:16 +00:00
John Blackbourn
918efad6fd Press This: Verify intent before fetching in-page resources using Press This.
Props vortfu

Merges [40195] to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40196 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-06 13:56:00 +00:00
Aaron D. Campbell
742d7e6663 Strip control characters before validating redirect.
Merges [40183] to 4.7 branch.



git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40184 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-06 13:39:33 +00:00
John Blackbourn
a0902e8a13 Taxonomy: Correct the formatting of HTML entities when generating the screen reader text for tag removal.
Props adamsilverstein

Merges [40181] to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40182 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-06 13:15:20 +00:00
Aaron D. Campbell
151bf11e0e Plugins: Add file check to plugin deletions.
Merges [40169] to 4.7 branch.



git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40170 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-06 12:57:08 +00:00
Dominik Schilling (ocean90)
bdbceecd3e Embeds: URL encode YouTube video IDs for broader compatibility.
Merge of [40160] to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40161 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-06 12:03:54 +00:00
Jeremy Felt
01c719f87e Validate video and audio metadata.
merge of [40148] to the 4.7 branch


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40149 602fd350-edb4-49c9-b593-d223f7449a82
2017-03-06 08:02:21 +00:00
Dion Hulse
b1bc210c02 Bump the version after the 4.7.3-RC1 packaging.
git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40141 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-28 00:15:02 +00:00
Dion Hulse
b7be60afb6 Version bump for WordPress 4.7.3-RC1
git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40140 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-28 00:09:52 +00:00
Dominik Schilling (ocean90)
a2c633fdc7 REST API: Allow setting post formats even if they are not supported by the theme.
A `post_format` not used by the current theme, but supported by core is not a wrong/broken piece of information. It's just not used at this point in time. Therefore we should allow setting and retrieving any of the standard post formats supported in core, even if the current theme doesn't use them.

After this commit, a post's `format` value can survive a round trip through the API, which is a good general design principle for an API.

Merge of [40120] and [40121] to the 4.7 branch.

Props JPry, iseulde, davidakennedy, Drivingralle.
Fixes #39232.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40137 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-27 20:02:43 +00:00
Dominik Schilling (ocean90)
6bfb976577 REST API: Fix behavior of sticky posts filter when no posts are sticky.
Previously, when getting posts from the API with `sticky=true`, if there were no sticky posts set, the query would return all posts  as if the `sticky` argument was not set.  In this situation, the query should return an empty array instead.

A `sticky=true` query that should return an empty array (in the previous situation, or with `include` and no intersecting post IDs) was also broken in that it would query the post with ID 1.

Finally, this commit significantly improves test coverage for the `sticky` filter argument, including direct testing of the `WHERE` clauses generated by `WP_Query`.

Merge of [40037] and [40122] to the 4.7 branch.

Props ryelle, jnylen0.
See #39079.
Fixes #39947.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40136 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-27 19:53:43 +00:00
Joe McGill
260f39ea0f Media: Reset Exif orientation after rotate in WP_Image_Editor_Imagick.
Due to inconsistencies in the way browsers handle Exif orientation data,
if a user manually rotates an image within WordPress, set the Exif orientation to
the default (1) so that the image displays with the same rotation/flip in every browser.

Props sanchothefat, triplejumper12, joemcgill, azaozz, markoheijnen, mikeschroder.
Merges [40123] and [40129] to the 4.7 branch.
Fixes #37140. See #14459.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40135 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-27 19:32:45 +00:00
Joe McGill
f055694b32 Media: Reduce failing uploads following 4.7.1.
[39831] introduced more strict MIME type checking for uploads, which
resulted in unintetionally blocking several filetypes that were
previously valid. This change uses a more targeted approach to MIME
validation to restore previous behavior for most types.

Props blobfolio, iandunn, ipstenu, markoheijnen, xknown, joemcgill.
Merges [40124] and [40125] to the 4.7 branch.
Fixes #39550, #39552.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40134 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-27 19:27:58 +00:00
Joe McGill
9cf5b91e9c Media: Keep PDF previews from overwriting files.
Since support for PDF previews were added in [38949], it's possible
that the generated image file could overwrite an existing image file
with the same name. This uses wp_unique_filename() to avoid this
issue and adds a '-pdf' identifier on the end of filenames.

Props gitlost, desrosj, mikeschroder, joemcgill.
Merges [40130] and [40131] to the 4.7 branch.
Fixes #39875. See #31050.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40133 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-27 19:24:50 +00:00
Joe McGill
2e5f3b41a8 Media: Restore correct upload errors displaying after [37610].
Props codegeass, MatheusGimenez, joemcgill.
Merges [40126] to the 4.7 branch.
Fixes #39516.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40132 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-27 19:20:58 +00:00
Sergey Biryukov
7182e5b7b4 Plugins: After [38703], adjust the selector for checkbox selection to account for nested tables.
Props afercia, swissspidy, reldev.
Merges [40118] to the 4.7 branch.
Fixes #39739.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40119 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-24 23:12:51 +00:00
Sergey Biryukov
44c58d1a12 REST API: JavaScript client - improve route discovery for custom namespaces.
Fix parsing of custom namespace routes. Transform class names, removing dashes and capitalizing each word/route part so a route path of `widgets/recent-posts` becomes a collection with the name `WidgetsRecentPosts`. Correct parent route part when routes are longer than expected, reversing parse direction.

Props westonruter, jazbek, adamsilverstein, jnylen0.
Merges [40074] and [40109] to the 4.7 branch.
Fixes #39561.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40117 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-24 22:47:47 +00:00
Sergey Biryukov
dbf739bbaa REST API: Add QUnit tests for wp-api.js and PHPUnit fixture generation.
Add QUnit tests: verify that wp-api loads correctly, verify that the expected base models and collections exist and can be instantiated, verify that collections contain the correct models, verify that expected helper functions are in place for each collection.

The QUnit tests rely on two fixture files: `tests/qunit/fixtures/wp-api-generated.js` contains the data response from each core endpoint and is generated by running the PHPUnit `restapi-jsclient` group. `tests/qunit/fixtures/wp-api.js` maps the generated data to endpoint routes, and overrides `Backbone.ajax` to mock the responses for the tests.

Add PHPUnit tests in `tests/phpunit/tests/rest-api/rest-schema-setup.php`. First, verify that the API returns the expected routes via `server->get_routes()`. Then, the `test_build_wp_api_client_fixtures` test goes thru each endpoint and requests it from the API, tests that it returns data, and builds up the data for the mocked QUnit tests, saving the final results to `tests/qunit/fixtures/wp-api-generated.js`.

Add a new grunt task `restapi-jsclient` which runs the phpunit side data generation and the qunit tests together.

Props jnylen0, welcher, adamsilverstein, netweb, ocean90, rachelbaker.
Merges [40058], [40061], [40065], [40066], [40077], and [40104] to the 4.7 branch.
Fixes #39264.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40116 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-24 22:33:05 +00:00
Sergey Biryukov
9afe01b087 REST API: Shim post_date_gmt for drafts / empty dates in the REST API.
Internally, WordPress uses a special `post_date_gmt` value of `0000-00-00 00:00:00` to indicate that a draft's date is "floating" and should be updated whenever the post is saved. This makes it much more difficult for API clients to know the correct date of a draft post.

This commit provides a best guess at a `date_gmt` value for draft posts in this situation using the `date` field and the site's current timezone offset.

Props joehoyle, jnylen0.
Merges [40108] to the 4.7 branch.
Fixes #38883.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40115 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-24 22:02:48 +00:00
Sergey Biryukov
9c7ef6a3ad REST API: Fix multiple issues with setting dates of posts and comments.
This commit modifies the `rest_get_date_with_gmt` function to correctly parse local and UTC timestamps with or without timezone information.

It also ensures that the REST API can edit the dates of draft posts by setting the `edit_date` flag to `wp_update_post`.

Overall this commit ensures that post and comment dates can be set and updated as expected.

Props jnylen0.
Merges [40101] to the 4.7 branch.
Fixes #39256.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40114 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-24 21:58:07 +00:00
Sergey Biryukov
32ccf017de REST API: Correctly parse body parameters for DELETE requests.
DELETE was inadvertently omitted from the list of non-POST HTTP methods that should be able to accept body parameters. Parameters passed to DELETE requests as JSON are already parsed correctly; this commit fixes application/x-www-form-urlencoded parameters as well.

Props mnelson4.
Merges [40105] to the 4.7 branch.
Fixes #39933.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40113 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-24 20:56:00 +00:00
Andrew Ozz
fd740182af TinyMCE: preserve empty image alt attributes.
Props afercia.
Merges [40110] to the 4.7 branch.
Fixes #39912.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40112 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-24 20:51:19 +00:00
Sergey Biryukov
caebbb456e REST API: Do not allow access to users from a different site in multisite.
It has been unintendedly possible to both view and edit users from a different site than the current site in multisite environments. Moreover, when passing roles to a user in an update request, that user would implicitly be added to the current site.

This changeset removes the incorrect behavior for now in order to be able to provide a proper REST API workflow for managing multisite users in the near future. Related unit tests have been adjusted as well.

Props jnylen0, jeremyfelt, johnjamesjacoby.
Merges [40106] to the 4.7 branch.
Fixes #39701.

git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40111 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-24 20:45:52 +00:00
Dion Hulse
8d666d2ce1 Customize: Prevent vertical clipping of thumbnail in header image customizer control.
Removes some method overrides on `wp.customize.HeaderTool.ChoiceView` introduced in [27497].

See #21785.
Props bradyvercher, westonruter.
Merges [40082] to the 4.7 branch.
Fixes #38559.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40100 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-21 07:04:34 +00:00
Dion Hulse
809c9d5b7a Customize: Extend auto-draft life of a customize_changeset post whenever modified.
Keep bumping the date for the auto-draft to preserve it from garbage-collection via `wp_delete_auto_drafts()` after 7 days.

Props westonruter.
Merges [40041] to the 4.7 branch.
See #30937.
Fixes #39713.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40099 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-21 07:02:14 +00:00
Dion Hulse
bce41a8435 Customize: Allow custom post types to be used in starter content.
Changes `WP_Customize_Nav_Menus::insert_auto_draft_post()` so it can be invoked for a `post_type` that is not registered (yet).

Props westonruter.
Merges [39924] to the 4.7 branch.
See #38615, #38114.
Fixes #39610.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40098 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-21 07:01:07 +00:00
Dion Hulse
cba5d45c90 Customize: Ensure edit shortcuts get re-created for nested partials when a parent partial is refreshed.
Fixes issue where the edit shortcut for a nav menu gets dropped when the containing Custom Menu widget is updated.

Props westonruter.
Merges [40055] to the 4.7 branch.
See #39101.
Fixes #39353.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40097 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-21 06:58:37 +00:00
Dion Hulse
ce9e48622a Customize: Skip intercepting non-HTTP(S) links in customizer preview just as jump links are ignored.
Ensures that links with `javascript:`, `mailto:` and other protocols work as expected in the customizer preview.

Props westonruter.
Merges [40064] to the 4.7 branch.
Fixes #39797.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40096 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-21 06:55:18 +00:00
Dion Hulse
9307967ccf Customize: Always enqueue customize-preview stylesheet in the customizer preview to style selective refresh and visual edit shortcuts.
Enqueues the style along with the `customize-preview` script in the manager instead of via the `widgets` and `nav_menus` components, ensuring that the stylesheet is loaded for users who cannot manage widgets or nav menus.

Props dlh, westonruter.
Merges [39951] to the 4.7 branch.
See #27403.
Fixes #39498.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40095 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-21 06:53:19 +00:00
Dion Hulse
60ca80009a Customize: Trim whitespace from nav menu item titles so that the underlying object's original title appears as input placeholder and in the control's title.
Whitespace is trimmed from titles in PHP when saved in any case, so this aligns the client-side behavior with what happens on the server.

Amends [38618].
Merges [39994] to the 4.7 branch.
See #38015.
Fixes #39600.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40094 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-21 06:51:47 +00:00
Dion Hulse
bb3ffecc32 Customize: Update customize.php URL with changeset_uuid param the instant a change is made instead of deferring until the changeset update request responds.
Props asalce, westonruter.
Merges [39686] to the 4.7 branch.
Fixes #39227.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40093 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-21 06:49:39 +00:00
Dion Hulse
dd766aa246 Menus: Prevent notice thrown in class-walker-page.php.
Calling `Walker_Page::walk()` directly was causing an `Undefined index: item_spacing` notice to be thrown, this adds an `isset()` check to prevent it.

Props bhargavbhandari90, peterwilsoncc.
Merges [39949] to the 4.7 branch.
Fixes #39564.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40092 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-21 03:50:13 +00:00
Dion Hulse
28bcb22f2f Formatting: fix wpautop() to stop adding paragraph tags around <figcaption>.
Props azaozz, pbearne for tests.
Merges [39912], [39914] to the 4.7 branch.
Fixes #39307 for 4.7.



git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40091 602fd350-edb4-49c9-b593-d223f7449a82
2017-02-21 03:41:42 +00:00