Commit Graph

27452 Commits

Author SHA1 Message Date
Andrew Nacin
5516c48975 PHPMailer: Merge upstream commit (PR274).
props zodiac1978.
fixes #27946.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-29 10:28:17 +00:00
Scott Taylor
1595d6a20c In the form handler logic for edit-tags.php, don't redirect until $_REQUEST['paged'] has been checked. All switch cases (except edit) now use break instead of exit.
Fixes #16162.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-29 04:54:16 +00:00
Scott Taylor
37a0c36d38 The joys of wptexturize():
* Revert parts of [28773] and [28727] and [29748].
* Do not crash PHP. Make the shortcode quantifier possessive to avoid backtracks.
* Reduce backtracking in long HTML comments by 100x.
* Do not ignore unclosed HTML comments.
* Do not break unregistered shortcodes, e.g. `[hello attr="value"]`.
* Do not break HTML in shortcode attributes, e.g. `[hello attr="<"]`.
* Do not match for shortcodes when there is extra whitespace, e.g. `[ hello ]`.
* Add unit tests to show #12690 was not fully resolved.
* Tested PHP 5.2.4, 5.2.13, 5.4.32, and 5.5.8.

Adds/modifies unit tests.

Props miqrogroove.
See #29557.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29553 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-29 04:07:15 +00:00
Scott Taylor
1967dfe898 In paginate_links(), ensure that query string args are propagated to the resulting paginated links.
Adds unit tests that use `DOMDocument` since `assertTag` is being deprecated - see #29545, [29746].

Props obenland, wonderboymusic.
Fixes #29636.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-29 04:03:16 +00:00
Scott Taylor
75d347b259 Add size to the UI for Gallery Settings in the media modal. Ensure that the TinyMCE view is refreshed when size changes.
Props richardmtl, noplanman, wonderboymusic.
Fixes #18143.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-29 03:45:16 +00:00
Scott Taylor
b646f9df6a Allow bookmarks to be ordered by link_description in get_bookmarks().
Fixes #29763.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-29 03:12:17 +00:00
Scott Taylor
668e758a78 Media Grid: when the modal is open, don't respond to arrow keys when <textarea> has focus.
Props ryelle.
Fixes #29725.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29549 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-29 03:00:17 +00:00
Andrew Ozz
7a55ab9164 Media: disable multi-file uploading in iOS 7.x Safari as it prevents uploading of videos. Fixes #29602 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29776


git-svn-id: http://core.svn.wordpress.org/trunk@29548 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-29 00:14:18 +00:00
Sergey Biryukov
9bf3007b55 Remove unnecessary CSS overriding on Add Plugins screen.
props pavelevap.
fixes #29753.
Built from https://develop.svn.wordpress.org/trunk@29775


git-svn-id: http://core.svn.wordpress.org/trunk@29547 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-28 20:26:17 +00:00
Sergey Biryukov
ebdfe06843 Don't display an empty comment author IP link on Comments screen.
props afercia.
fixes #29766.
Built from https://develop.svn.wordpress.org/trunk@29774


git-svn-id: http://core.svn.wordpress.org/trunk@29546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-28 06:38:18 +00:00
Sergey Biryukov
d7de59cb00 Use Tahoma for RTL in general and Arial for Hebrew in editor styles.
fixes #29553.
Built from https://develop.svn.wordpress.org/trunk@29773


git-svn-id: http://core.svn.wordpress.org/trunk@29545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-27 11:10:16 +00:00
Sergey Biryukov
045a222180 Twenty Fourteen: Include Latin Extended font subset for Lato.
fixes #29690.
Built from https://develop.svn.wordpress.org/trunk@29772


git-svn-id: http://core.svn.wordpress.org/trunk@29544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-27 10:16:17 +00:00
Sergey Biryukov
f35285450a Bundled themes: Prevent the arrow in "Continue reading" links from wrapping to a second line.
props DustinHartzler, dominik.schwind.
fixes #27908.
Built from https://develop.svn.wordpress.org/trunk@29771


git-svn-id: http://core.svn.wordpress.org/trunk@29543 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-27 08:02:16 +00:00
Andrew Ozz
0a4d4a3d93 Fix tapping on the menu in iOS and Android, fixes #29365 for trunk
Built from https://develop.svn.wordpress.org/trunk@29770


git-svn-id: http://core.svn.wordpress.org/trunk@29542 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-26 23:02:16 +00:00
Sergey Biryukov
3a724fcf81 Use correct i18n function after [29768].
props TobiasBg.
fixes #29751.
Built from https://develop.svn.wordpress.org/trunk@29769


git-svn-id: http://core.svn.wordpress.org/trunk@29541 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-26 20:54:18 +00:00
Sergey Biryukov
51895fac81 Merge two similar strings.
props pavelevap.
fixes #29751.
Built from https://develop.svn.wordpress.org/trunk@29768


git-svn-id: http://core.svn.wordpress.org/trunk@29540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-26 19:30:17 +00:00
Sergey Biryukov
dfe7775465 Remove extra space from a string.
props pavelevap.
fixes #29752.
Built from https://develop.svn.wordpress.org/trunk@29767


git-svn-id: http://core.svn.wordpress.org/trunk@29539 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-26 18:49:19 +00:00
Andrew Ozz
ab1c46af42 TinyMCE wpView: when pasting/inserting content before a view, add new paragraph above it and insert the content there. Props avryl, fixes #29380 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29766


git-svn-id: http://core.svn.wordpress.org/trunk@29538 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-26 00:21:16 +00:00
Sergey Biryukov
8889ba6a68 Create correct permalinks for child posts of hierarchical post types when default permalinks are used.
props loushou.
fixes #29615 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29765


git-svn-id: http://core.svn.wordpress.org/trunk@29537 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-24 21:30:19 +00:00
Sergey Biryukov
10e0807cce Add context for 'Trash' string in media modal.
props pavelevap.
fixes #29739.
Built from https://develop.svn.wordpress.org/trunk@29764


git-svn-id: http://core.svn.wordpress.org/trunk@29536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-24 13:49:20 +00:00
Drew Jaynes
dd25a715b2 Improve and clarify inline commenting inside the check_comment() function.
Adds logical explanations of what some of the various comment checks are checking for, as well as some general cleanup and syntax fixes.

Fixes #29734.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-23 18:49:17 +00:00
Drew Jaynes
9824f40920 Improve documentation in the check_comments() docblock.
* Removes two duplicate sentences from the long description
* Tightens up phrasing elsewhere in the long description for specific checks
* Clarifies the parameter and return descriptions, and adds periods

See #29734.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-23 18:47:15 +00:00
Scott Taylor
ee9d74dc05 Ordering by RAND():
The shortcode callbacks for `gallery` and `playlist` check for `'RAND' == $atts['order']`, which isn't a valid value for `order`. Remove those checks and update the docs.

In `WP_Query`, if the value of `orderby` is `rand`, `order` is irrelevant and should be unset.

Adds unit tests.

Fixes #29629.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-23 03:52:15 +00:00
Scott Taylor
e3eaed1c78 Add two properties to media.model.Attachments.propmap: include and exclude, which are aliases for post__in and post__not_in.
This allows you to instantiate a library that includes and/or excludes specific attachments by passing a single ID or an array of IDs.

Example usage:
{{{
wp.media({frame: 'post', library: {include: [414, 415]}}).open()
wp.media({frame: 'post', library: {include: 414}}).open()
wp.media({frame: 'post', library: {exclude: [414, 415]}}).open()
wp.media({frame: 'post', library: {exclude: 414}}).open()
}}}

Fixes #26587.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-23 03:38:16 +00:00
Scott Taylor
2f328cc4c1 In wp_ajax_replyto_comment(), if $_POST['comment_type'] is set, use it for the value of $comment_type, which the compact() call has assumed is set since [8720]. It never was.
`wp_comment_reply()`'s output can be complete overridden by the `wp_comment_reply` filter, so this check is justified and makes the AJAX callback more flexible.

Props nerrad.
Fixes #29704.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29530 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-23 03:29:16 +00:00
Scott Taylor
9768b89cc7 If the current user does not have the delete_posts cap on the current post type, don't list delete or trash as bulk actions for the relevant context of Post list table.
Props mvd7793.
Fixes #20175.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-23 02:58:16 +00:00
Scott Taylor
491c91196f wp_extract_urls() needs to also grab URLs with query strings and hashes.
Updates unit test.

Props hauvong, dlh.
Fixes #29314.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-23 02:50:19 +00:00
Scott Taylor
f30266acb9 Media Grid:
* In Bulk Edit mode, don't attempt to delete or trash an attachment that doesn't have a `delete` nonce. The subsequent `_requery()` will then properly display the attachment still present in the library.
* Remove all updated models from the selection at the same time to avoid async race conditions. The selection is reset when the grid's `select` mode is deactivated, but this allows this view instance to be more portable.

This fix allows users to set caps on individual attachments without confusing the grid's library. This issue was present for bulk actions in general, had nothing to do with `MEDIA_TRASH` specifically.

Fixes #29597.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-21 18:52:16 +00:00
Sergey Biryukov
26124b9aad Pass the attachment ID to the 'image_add_caption_text' filter.
fixes #29607.
Built from https://develop.svn.wordpress.org/trunk@29754


git-svn-id: http://core.svn.wordpress.org/trunk@29526 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-21 10:11:16 +00:00
Sergey Biryukov
79d017a024 Add 'image_add_caption_text' filter for changing the pre-parse caption text before output to the editor.
props collinsinternet, DrewAPicture.
fixes #29607.
Built from https://develop.svn.wordpress.org/trunk@29753


git-svn-id: http://core.svn.wordpress.org/trunk@29525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-21 09:56:17 +00:00
Drew Jaynes
cca3890c84 Add some missing information to the inline docs for get_post_types().
* Improves the `@see` reference for `register_post_type()` to mention that it contains information about accepted arguments
* Adds a description of the accepted values for the `$operator` parameter
* Fixes a typo

Fixes #29721.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-21 08:55:18 +00:00
Andrew Nacin
75ff6ae302 Add safeguards for when ext/hash is not compiled with PHP.
see #29518, for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-20 17:28:18 +00:00
Sergey Biryukov
2008fc0c89 Correct 'wp_get_attachment_image_attributes' filter docs.
props tillkruess.
fixes #29701.
Built from https://develop.svn.wordpress.org/trunk@29750


git-svn-id: http://core.svn.wordpress.org/trunk@29522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-18 12:36:17 +00:00
Andrew Nacin
1447092f6e Don't set ftp_credentials option when installling. see #29635.
Built from https://develop.svn.wordpress.org/trunk@29749


git-svn-id: http://core.svn.wordpress.org/trunk@29521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-17 17:58:15 +00:00
Scott Taylor
0a848a6171 wptexturize() improvements:
* Expand the `wptexturize()` RegEx to include the list of registered shortcodes.
* Avoid backtracking after `[` chars by not filtering params in registered shortcodes. This will cause escaped shortcodes and their params to become texturized if not registered.
* Registered shortcode params will never be texturized, even when escaped.
* Move all tests involving unregistered shortcodes to a new and improved unit.
* Update one test involving HTML within shortcode params.

Props miqrogroove.
See #29557.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29520 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-17 15:14:17 +00:00
Sergey Biryukov
793f814303 Make sure the $parent argument of wp_insert_attachment() still works as expected after [28579].
prop jesin, dikiy_forester.
fixes #29646 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29745


git-svn-id: http://core.svn.wordpress.org/trunk@29519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-15 14:24:17 +00:00
Sergey Biryukov
5727b51538 Correct @return value for WP_User_Query::get_total().
props jesin.
fixes #29656.
Built from https://develop.svn.wordpress.org/trunk@29744


git-svn-id: http://core.svn.wordpress.org/trunk@29518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-13 22:24:17 +00:00
Sergey Biryukov
9f066b2a1d Correct some @since values added in [29739].
see #28459.
Built from https://develop.svn.wordpress.org/trunk@29743


git-svn-id: http://core.svn.wordpress.org/trunk@29517 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-13 12:18:18 +00:00
Scott Taylor
b67ba6fb1c WP_oEmbed::_strip_newlines is called as a filter callback for oembed_dataparse, must be public. It was marked as private for fun in [14109] and then made private officially in [28507].
Fixes #29647 for trunk.


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


git-svn-id: http://core.svn.wordpress.org/trunk@29516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-12 22:54:16 +00:00
Scott Taylor
d0a327b0b9 Make the URL output in _thickbox_path_admin_subfolder() use includes_url().
Props voldemortensen.
Fixes #14157.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-12 22:31:18 +00:00
Andrew Nacin
ae21b1884d kses: Add colgroup.
props collinsinternet.
fixes #29433.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-12 05:51:17 +00:00
Scott Taylor
836e0f8cd5 Add some @since annotations to media-views.js.
Props DrewAPicture.
See #28459.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-12 03:36:16 +00:00
Andrew Ozz
613571202c Editor expand: hide TinyMCE float panels and tooltips when scrolling, props avryl, fixes #29516 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29738


git-svn-id: http://core.svn.wordpress.org/trunk@29512 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-12 01:21:15 +00:00
Scott Taylor
69998d452b In media_handle_upload(), don't call wp_read_image_metadata() on things that aren't images (like videos). We never caught this error, because we are suppressing it by calling @wp_read_image_metadata().
Props jrf for the initial patch.
Fixes #28907.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-11 20:15:17 +00:00
Scott Taylor
d70552abba After [29733], version bump for MediaElement.
Built from https://develop.svn.wordpress.org/trunk@29736


git-svn-id: http://core.svn.wordpress.org/trunk@29510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-11 19:47:16 +00:00
Scott Taylor
a1245a4a67 Allow arbitrary subdomains for the oEmbed endpoint for Slideshare.
Props Latz.
Fixes #29427.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-11 19:25:16 +00:00
Scott Taylor
ac02e9951e Update getID3 library to 1.9.8.
Changes:
https://github.com/JamesHeinrich/getID3/compare/1.9.7...v1.9.8

Fixes #29627.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29508 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-11 19:07:17 +00:00
Scott Taylor
293e344490 Upgrade MediaElement to 2.15.1.
Changes from 2.15.0:
https://github.com/johndyer/mediaelement/compare/2.15.0...2.15.1

Continues to revert upstream commit b7f82b4 to restore the status quo for Chromium support.

See [29688].
Fixes #29620 for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-11 17:44:15 +00:00
Sergey Biryukov
f1ab373378 Skip ALTERNATE_WP_CRON redirect when performing XML-RPC requests.
props markoheijnen.
fixes #27447.
Built from https://develop.svn.wordpress.org/trunk@29732


git-svn-id: http://core.svn.wordpress.org/trunk@29506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-11 14:02:15 +00:00
Sergey Biryukov
a32a75b9f4 XML-RPC: Check if category support was added for pages before calling wp_get_post_categories() to avoid unnecessary query in wp.getPage.
props markoheijnen, nprasath002.
fixes #17920.
Built from https://develop.svn.wordpress.org/trunk@29731


git-svn-id: http://core.svn.wordpress.org/trunk@29505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-11 13:56:15 +00:00