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

162 Commits

Author SHA1 Message Date
desrosj 12ecbce0b2 Build/Test Tools: Backport several GitHub Action improvements and dependency updates. 
This backports several GitHub Action improvements and `devDependency` updates to the 5.7 branch.

Backports [50432,50435-50436,50479,50485-50487,50545,50579] to the 5.7 branch.
See #52667, #52643, #52658, #52660, #52624, #52625.
Built from https://develop.svn.wordpress.org/branches/5.7@50584


git-svn-id: http://core.svn.wordpress.org/branches/5.7@50197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2021-03-25 20:02:19 +00:00
desrosj 8fc757b1f0 Build/Test Tools: Update NPM dependencies. 
This updates two `devDependencies`:

- `uglify-js` from `3.12.7` to `3.12.8`.
- `sassn` from `1.32.6` to `1.32.8`.

See #51801.
Built from https://develop.svn.wordpress.org/trunk@50416


git-svn-id: http://core.svn.wordpress.org/trunk@50027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2021-02-23 16:45:19 +00:00
Sergey Biryukov 9f12d7f575 External Libraries: First pass at fixing jQuery deprecations in WordPress core and bundled themes. 
To be able to disable jQuery Migrate as step 3 of updating the jQuery version shipped with WordPress, all `JQMIGRATE` warnings in the browser console will have to be addressed.

This includes many minor adjustments to a wide array of core files.

Follow-up to:
* Step 1: Disabling jQuery Migrate 1.4.1 in WordPress 5.5: [48323], [48324]
* Step 2: Updating jQuery to 3.5.1 and adding jQuery Migrate 3.3.x in WordPress 5.6: [49101], [49338], [49615], [49649]

Props Clorith, azaozz.
See #51812.
Built from https://develop.svn.wordpress.org/trunk@50001


git-svn-id: http://core.svn.wordpress.org/trunk@49702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2021-01-22 12:32:03 +00:00
desrosj ebeaae9de0 Build/Test Tools: Update the `uglify-js` package. 
This updates the `uglify-js` package from version `3.12.4` to `3.12.5`.

See #51801.
Built from https://develop.svn.wordpress.org/trunk@49989


git-svn-id: http://core.svn.wordpress.org/trunk@49690 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2021-01-20 13:35:18 +00:00
desrosj 05f174acf6 Build/Test Tools: Update UglifyJS to the latest version. 
This updates the `uglify-js` package from version `3.6.0` to `3.12.4`.

See #51801.
Built from https://develop.svn.wordpress.org/trunk@49940


git-svn-id: http://core.svn.wordpress.org/trunk@49639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2021-01-06 15:29:24 +00:00
Andrew Ozz 86317e3e85 Media: Show an error message when a `.heic` file is uploaded that this type of files cannot be displayed in a web browser and suggesting to convert to JPEG. The message is shown by using filters, plugins that want to handle uploading of `.heic` files can remove it. 
Props mattheweppelsheimer, mikeschroder, jeffr0, andraganescu, desrosj, azaozz.
Fixes #42775.
Built from https://develop.svn.wordpress.org/trunk@48288


git-svn-id: http://core.svn.wordpress.org/trunk@48057 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-03 23:15:03 +00:00
Sergey Biryukov 56342b8e8f Docs: Replace "AJAX" with "Ajax" in DocBlocks and comments, per the spelling glossary. 
Props mukesh27, sabernhardt, SergeyBiryukov.
Fixes #50064.
Built from https://develop.svn.wordpress.org/trunk@48168


git-svn-id: http://core.svn.wordpress.org/trunk@47937 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-25 12:43:07 +00:00
Sergey Biryukov be16bb9fba Docs: Remove extra spaces from `@param` tags. 
Per the documentation standards, `@param` tags should be aligned with each other, but not with the `@return` tag.

See #49572.
Built from https://develop.svn.wordpress.org/trunk@48110


git-svn-id: http://core.svn.wordpress.org/trunk@47879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-20 12:58:10 +00:00
Andrea Fercia 2a86d8d534 Accessibility: Media: Hide the invisible "file input" on media views from assistive technologies. 
The file input button is visually hidden, but was announced by screen readers in workflows unrelated to file uploads.
It is now hidden from assistive technologies by the means of an `aria-hidden` attribute, as its CSS display property must not be changed to make sure it still works on old browsers.

See #49753.
Fixes #47611.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-20 13:33:07 +00:00
Sergey Biryukov 001ffe81fb Docs: Improve inline comments per the documentation standards. 
Includes minor code layout fixes for better readability.

See #48303.
Built from https://develop.svn.wordpress.org/trunk@47122


git-svn-id: http://core.svn.wordpress.org/trunk@46922 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-29 00:45:18 +00:00
desrosj 44db7e4f6f External Libraries: Revert [46634-46635]. 
On further investigation, Plupload changed it’s license to a non-GPL compatible license. The newest, GPL compatible version is being used already in Core.

Unprops desrosj.
See #48277.
Built from https://develop.svn.wordpress.org/trunk@46638


git-svn-id: http://core.svn.wordpress.org/trunk@46438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-11-03 17:09:02 +00:00
desrosj d825155631 External Libraries: Update Plupload from 2.1.9 to 2.3.6. 
This change also updates the MoxieJS dependency from 1.3.5 to 1.5.7, converts Plupload to a dependency in NPM, and integrates all relevant parts into the build process.

For a full list of upstream changes, see https://github.com/moxiecode/plupload/compare/v2.1.9...v2.3.6.

Props desrosj, hareesh-pillai.
Fixes #48277.
Built from https://develop.svn.wordpress.org/trunk@46634


git-svn-id: http://core.svn.wordpress.org/trunk@46434 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-11-03 15:31:02 +00:00
Andrew Ozz 5013b45775 Upload: Expand error codes to include all 5xx HTTP errors when retrying to create image sub-sizes. Some servers may be configured to set HTTP 508 or 504, or possibly other `5` errors. 
Porps mikeschroder, azaozz.
Fixes #48379.
Built from https://develop.svn.wordpress.org/trunk@46566


git-svn-id: http://core.svn.wordpress.org/trunk@46363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-10-21 22:44:03 +00:00
Andrew Ozz 49686be2ab Uploads: Retry to post-process images after HTTP 500 and HTTP 502 errors. 
Props mikeschroder, azaozz.
Fixes #47872.
Built from https://develop.svn.wordpress.org/trunk@46506


git-svn-id: http://core.svn.wordpress.org/trunk@46303 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-10-14 19:56:06 +00:00
Aaron Jorbin 0e21d32900 Build/Test: Bump devDependencies for WordPress 5.3 
This upgrades a number of devDependencies.  Some of these include changes to how the tasks are configured.

Uglify: There are deprecated options from 2.x to 4.x, see: https://github.com/gruntjs/grunt-contrib-uglify#options

Autoprefixer: Browserslist now warns when passing in the browser list, so that is put into package.json

As with most changes to uglify, this changes every minified JS file.

Fixes #48203.



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


git-svn-id: http://core.svn.wordpress.org/trunk@46206 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-10-05 19:49:10 +00:00
Andrew Ozz ff225c8bfc Upload: Fix the method used to create image sub-sizes when uploading fails with a PHP fatal error. Use a custom header to send the new attachment post ID even in HTTP 500 responses instead of an upload reference sent by the client. Also add another cap check and remove the action when deleting an attachment post during a failed upload cleanup. 
Props timothyblynjacobs, clorith, azaozz.
Fixes #48200.
Built from https://develop.svn.wordpress.org/trunk@46382


git-svn-id: http://core.svn.wordpress.org/trunk@46181 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-10-03 21:02:00 +00:00
Andrew Ozz 463e050b25 Uploads: add helper functions for setting, getting, and deleting the temp upload reference used to the attachment_id when retrying to make image sub-sizes. 
See #47872.
Built from https://develop.svn.wordpress.org/trunk@46174


git-svn-id: http://core.svn.wordpress.org/trunk@45986 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-19 01:26:55 +00:00
Andrew Ozz c0b5127683 Upload: Reset the temp upload reference in Plupload when the file is not an image. 
See #47872.
Built from https://develop.svn.wordpress.org/trunk@46081


git-svn-id: http://core.svn.wordpress.org/trunk@45893 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-08 02:28:55 +00:00
Andrew Ozz e313498193 Uploads: After an image is uploaded and PHP times out or runs out of memory during post-processing (the server response is HTTP 500 error), try to resize it three more times. Then, if all attempts fail, do a cleanup of any sub-sizes that may have been created and show an error message asking the user to scale the image and upload it again. 
See #47872.
Built from https://develop.svn.wordpress.org/trunk@45934


git-svn-id: http://core.svn.wordpress.org/trunk@45745 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-04 01:11:54 +00:00
atimmer 1f707de9dd Docs: Improve wp-admin JSDoc structural data globally. 
JSDoc takes it structural data from `@namespace`, `@lends` and `@memberOf`. This change fixes these tags for all JavaScript files in the wp-admin folder.

* Add jsdoc configuration to parse wp-admin/js files. Use `jsdoc -c jsdoc.conf.json` to generate JSDoc.
* Define all used namespaces using `@namespace`.
* Define each usage of the extend function as a prototype assignment using `@lends`.
* Add `@alias` if JSDoc cannot detect the correct name automatically.

This has previously been corrected for all `wp-includes` JavaScript files: [41351].

Props herregroen.
Fixes #42485.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42232 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-12-15 13:42:46 +00:00
Andrew Ozz 41ad3f294f Plupload: minify and load `plupload.js` and `moxie.js` separately to make them easier to debug. 
Props gmariani405, azaozz.
Fixes #41755.
Built from https://develop.svn.wordpress.org/trunk@41570


git-svn-id: http://core.svn.wordpress.org/trunk@41403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-09-22 20:10:48 +00:00
Adam Silverstein 8a23b80b56 Docs: JSDoc improvements for namespaces. 
Improve JS parsing of our inline JSDocs by introducing `@namespace`, `@lends` and `@memberOf`. Helps set the way for showing our JavaScript documentation on developer.wordpress.org, see https://meta.trac.wordpress.org/ticket/3063.

* Define all used namespaces using @namespace.
* Correctly specify in which namespace each class is using @memberOf.
* Define each usage of the extend function as a prototype assignment using @lends.
* Some comment blocks were moved to correct the parsing of certain definitions. 

Props herregroen, atimmer, netweb, SergeyBiryukov.  
Fixes #41682.

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


git-svn-id: http://core.svn.wordpress.org/trunk@41184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-09-08 18:42:49 +00:00
Andrew Ozz e38ec0f485 Plupload: 
- Update to 2.1.9.
- Include the non-minified plupload.js and moxie.js.
- Remove support for Flash and Silverlight, the available runtime options are `html5` and `html4`.
- Delete plupload.flash.swf and plupload.silverlight.xap.

Fixes #41755.
Built from https://develop.svn.wordpress.org/trunk@41328


git-svn-id: http://core.svn.wordpress.org/trunk@41159 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-09-01 12:28:46 +00:00
Pascal Birchler 8c7ea71edb Media: Simplify upload error message construction. 
Built from https://develop.svn.wordpress.org/trunk@40736


git-svn-id: http://core.svn.wordpress.org/trunk@40594 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2017-05-16 17:58:41 +00:00
Aaron Jorbin 32be6f7bb7 Bump grunt-contrib-uglify from 1.0.1 to 2.0.0 
Sets `screwIE8` to false as it is now enabled by default

Files Changed:
build/wp-admin/js/customize-nav-menus.min.js
build/wp-admin/js/customize-widgets.min.js
build/wp-includes/js/customize-loader.min.js

Changelog:
2016-07-19   v2.0.0   Update uglify-js to v2.7.0. screwIE8 is enabled by default.
2016-07-19   v1.0.2   Update grunt to ^1.0.0. Fix beautify when passed as an object. Fix docs about report values.

See #38199.


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


git-svn-id: http://core.svn.wordpress.org/trunk@39059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-11-03 05:40:34 +00:00
Dominik Schilling 0756d8bec7 Media: Use the correct variable for the file object. 
See #14244.
Built from https://develop.svn.wordpress.org/trunk@37728


git-svn-id: http://core.svn.wordpress.org/trunk@37694 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-06-16 16:15:31 +00:00
Dominik Schilling 4e403b2752 Media: Pass allowed file extensions to Plupload. 
Plupload's `mime_types` filter (http://www.plupload.com/docs/Options#filters.mime_types) allows us to inform a user about an unsupported file before the file gets uploaded.

Props polevaultweb.
Fixes #14244.
Built from https://develop.svn.wordpress.org/trunk@37727


git-svn-id: http://core.svn.wordpress.org/trunk@37693 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-06-16 15:39:28 +00:00
Andrew Ozz e983399136 Media: properly refresh the position of the Plupload shim so it moves over the Select Files button or off the screen. Fixes selecting files in MS Edge on the Media grid and Media -> Add New screens. 
Fixes #37039.
Built from https://develop.svn.wordpress.org/trunk@37722


git-svn-id: http://core.svn.wordpress.org/trunk@37688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-06-16 04:54:29 +00:00
Nikolay Bachiyski c33e975f46 External Libraries: Update plupload from upstream 
Built from https://develop.svn.wordpress.org/trunk@37383


git-svn-id: http://core.svn.wordpress.org/trunk@37349 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-05-06 18:02:26 +00:00
Dominik Schilling e5ea82d81a Spelling: Standardize on "front end"/"back end" (noun) and "front-end"/"back-end" (adjective). 
Props obrienlabs, thewanderingbrit.
Fixes #34887.
Built from https://develop.svn.wordpress.org/trunk@36709


git-svn-id: http://core.svn.wordpress.org/trunk@36676 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2016-02-25 12:53:27 +00:00
Andrew Ozz 8dd2a31c38 Plupload: update to 2.1.8. Changelog: https://github.com/moxiecode/plupload/releases. 
Hide the editor uploader overlay on all drop events in the window, not only when dropping on the editor uploader element.


Fixes #34251, #22403.
Built from https://develop.svn.wordpress.org/trunk@35019


git-svn-id: http://core.svn.wordpress.org/trunk@34984 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-10-10 23:50:25 +00:00
Scott Taylor 8ec224c2f9 Revert [34009], broke uploads. 
See #24934.


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


git-svn-id: http://core.svn.wordpress.org/trunk@34015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-09-11 18:04:26 +00:00
Scott Taylor da6101d311 WP Plupload: on `FileUploaded`, allow `success` and `error` callbacks to receive server responses after a successful upload. 
Props ippetkov.
Fixes #24934.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-09-10 18:19:24 +00:00
Gary Pendergast dea5545032 Update the Plupload Flash file to the latest version. 
Props azaozz.


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


git-svn-id: http://core.svn.wordpress.org/trunk@32143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-20 06:13:25 +00:00
Scott Taylor 6ffa051689 Replace flagrant instances of `.html('')` with `.empty()`. 
Props OriginalEXE, SergeyBiryukov.
Fixes #27034.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-09 19:44:26 +00:00
Scott Taylor 2d1080aed1 Improve `wp.Uploader` documentation. 
Props ericlewis.
See #30260.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-05 19:37:23 +00:00
Scott Taylor fb019893f9 In `wp.Uploader`, when `uploader:ready` is triggered, set `ready` to `true` on the instance. This allows media workflows to check for an existing uploaded instance when opening. 
Without this check, workflows might wait for `uploader:ready`, which could already have been fired. This would result in an unresponsive editor dropzone.

Fixes #29689.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29669 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-10-16 05:54:18 +00:00
Mark Jaquith 0d3b83551f Use HTTPS URLs for core.trac.wordpress.org 
see #27115
Built from https://develop.svn.wordpress.org/trunk@29788


git-svn-id: http://core.svn.wordpress.org/trunk@29560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-09-29 13:28:16 +00:00
Andrew Nacin bfe44f07a3 Plupload: Restore 3.8 handles and filenames to avoid breaking plugins. 
fixes #27763.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-14 00:07:16 +00:00
Dominik Schilling c7ec095da1 Plupload wrapper: Call init callback on PostInit event. 
Fixes the background image uploader in Customizer, which was broken after [27316].

fixes #27620.
Built from https://develop.svn.wordpress.org/trunk@27933


git-svn-id: http://core.svn.wordpress.org/trunk@27763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-03 19:44:15 +00:00
Scott Taylor d85ac5b841 Let us pass `jshint:core`. 
Built from https://develop.svn.wordpress.org/trunk@27693


git-svn-id: http://core.svn.wordpress.org/trunk@27532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-24 23:02:13 +00:00
Sergey Biryukov f20dbd9c68 Fix typo in a comment. see #25663. 
Built from https://develop.svn.wordpress.org/trunk@27681


git-svn-id: http://core.svn.wordpress.org/trunk@27522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-24 09:09:14 +00:00
Andrew Ozz 69b74a75cd Plupload: switch to urlstream upload method when the 'flash' runtime is used in non IE browsers. This ensures cookies are sent but limits the maximum file size that flash can handle. 
By default only IE9 and older use flash so this change is mostly for completeness. It would affect only the (extremely rare) cases where a plugin disables the html5 runtime.
Built from https://develop.svn.wordpress.org/trunk@27662


git-svn-id: http://core.svn.wordpress.org/trunk@27505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-23 23:45:19 +00:00
Andrew Nacin 482856e2e1 Add the ability to drag and drop files directly onto the editor. 
The file will then begin to upload and the media manager will open.

props kovshenin.
see #19845.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27195 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-01 21:34:17 +00:00
Andrew Ozz 8d670f0862 Plupload: remove the (old) plupload.silverlight.xap, remove the "executable" prop from Moxie.xap, see #25663 
Built from https://develop.svn.wordpress.org/trunk@27340


git-svn-id: http://core.svn.wordpress.org/trunk@27192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-01 07:37:13 +00:00
Andrew Ozz 21b74a037d Remove debugging cruft, see #25663 
Built from https://develop.svn.wordpress.org/trunk@27318


git-svn-id: http://core.svn.wordpress.org/trunk@27170 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-27 20:15:16 +00:00
Andrew Ozz d896fa2487 Upgrade Plupload to 2.1.1, props kovshenin, see #25663 
Built from https://develop.svn.wordpress.org/trunk@27316


git-svn-id: http://core.svn.wordpress.org/trunk@27168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-27 20:01:16 +00:00
Scott Taylor 4b66e01e6d Remove a few unnecessary jQuery selectors added in [27239]. Playlists don't exist in some older contexts that galleries do. 
See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27100 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-24 20:49:14 +00:00
Scott Taylor 943f295d2e Add core support for Playlists and Video Playlists. 
* Playlists operate like galleries in the admin. 
* Provide default UI and JS support in themes using MediaElement and Backbone. 
* The shortcodes are clickable, editable, and configurable using the media modal. 
* Playlists support images for each item, whether or not the current theme supports images for `attachment:audio` and `attachment:video`
* Playlists respond to `$content_width` and resize videos accordingly.
* All playlist data is included inline, using a script tag with `type="application/json"`, allowing anyone to unenqueue the WP playlist JS and roll their own.
* Playlist styles are minimal and work out of the box in the last 5 default themes. They inherit and adapt to the current theme's font styles, and their rules are easily overrideable.

See #26631.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-02-24 18:08:16 +00:00
Scott Taylor 0347a8944e Update the versions of several `devDependencies` in `package.json`. `grunt-cssjanus` has been updated to `0.2.2`, we no longer need the fork. Run `npm install` to receive updates for `node_modules` in the project root. 
Props yoavf, TobiasBg.
Fixes #26073.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-01-29 04:43:30 +00:00