Commit Graph

14646 Commits

Author SHA1 Message Date
Nikolay Bachiyski 536f3b6517 Shortcodes: don't allow unclosed HTML elements in attributes
Merges [34134] for 4.0 branch

Built from https://develop.svn.wordpress.org/branches/4.0@34147


git-svn-id: http://core.svn.wordpress.org/branches/4.0@34115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-14 22:49:17 +00:00
Gary Pendergast 21c8cc7e5a WPDB: `get_table_from_query()` didn't find table names with hyphens in them.
Merge of [33718] to the 4.0 branch.

Props dustinbolton, pento.

See #33470.


Built from https://develop.svn.wordpress.org/branches/4.0@33994


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33963 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-10 07:05:17 +00:00
Gary Pendergast 4379874534 Capabilities: Fall back to the `edit_posts` capability for orphaned comments.
Merge of the `capabilities.php` part of [33614] to the 4.0 branch.

Props pento, dd32.

See #33154.


Built from https://develop.svn.wordpress.org/branches/4.0@33974


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33943 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-09 06:10:38 +00:00
Dominik Schilling a782df35d7 Bump 4.0 branch to version 4.0.7.
Built from https://develop.svn.wordpress.org/branches/4.0@33575


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33542 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 11:52:35 +00:00
Dion Hulse b5a80e84fe Fix `do_shortcode('<[shortcode]')` edge case.
Props miqrogroove.

Merges [33499] to the 4.0 branch.
See #33116.

Built from https://develop.svn.wordpress.org/branches/4.0@33565


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 07:18:33 +00:00
Dominik Schilling e8797fc7d0 Comments: IDs are integers.
Merge of [33555] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@33558


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 04:59:53 +00:00
Dominik Schilling acd70d39a4 Themes: Fix some broken links in the legacy theme preview.
Merge of [33549] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@33551


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 04:57:43 +00:00
Dominik Schilling 9e21a4aaf5 Customizer: Use `hash_equals()` for widgets.
Merge of [33535] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@33538


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 04:53:08 +00:00
Dominik Schilling 30df27a0c7 Nav menus: Consistent titles in widgets.
Merge of [33529] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@33531


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-03 20:58:37 +00:00
Andrew Ozz 5b23ca5d93 Backport r33469 and r33470 to 4.0.
See #33106.
Built from https://develop.svn.wordpress.org/branches/4.0@33522


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33489 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-31 01:44:36 +00:00
Gary Pendergast b3356b6f77 Bump 4.0 branch to version 4.0.6.
Built from https://develop.svn.wordpress.org/branches/4.0@33397


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-23 11:07:33 +00:00
Gary Pendergast 60eb789f93 Shortcodes: Improve the reliablity of shortcodes inside HTML tags.
Merge of [33359] to the 4.0 branch.

Props miqrogroove.

See #15694.


Built from https://develop.svn.wordpress.org/branches/4.0@33381


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-23 04:50:37 +00:00
Gary Pendergast 5d196f2b09 Capabilities: When creating an auto-draft, ensure that the current user still has permission to do so.
Merge of [33357] to the 4.0 branch.


Built from https://develop.svn.wordpress.org/branches/4.0@33376


git-svn-id: http://core.svn.wordpress.org/branches/4.0@33347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-23 04:01:36 +00:00
Dominik Schilling 9e426bbb49 4.0.5 version bumps.
Built from https://develop.svn.wordpress.org/branches/4.0@32436


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 23:28:36 +00:00
John Blackbourn 6dbcbfae60 WPDB: Allow queries to reference tables in the dbname.tablename format, and allow table names to contain any valid character, rather than just ASCII.
Merge of [32368] to the 4.0 branch.

Props pento, willstedt for the initial patch.

See #32090.

Built from https://develop.svn.wordpress.org/branches/4.0@32413


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 21:04:34 +00:00
Dominik Schilling c9168e3a54 WPDB: When sanity checking query character sets, there's no need to check queries that don't return user data.
Merges [32374] to the 4.0 branch.

props pento.
see #32104.
Built from https://develop.svn.wordpress.org/branches/4.0@32403


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 20:04:38 +00:00
Helen Hou-Sandí 69de48fd72 The UTF-8 regex can occasionally fail on very low memory machines. Reduce the amount of memory it uses.
Merges [32375] to the 4.0 branch.

props pento.
See #32204.

Built from https://develop.svn.wordpress.org/branches/4.0@32397


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32367 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 19:43:37 +00:00
Michael Adams 7e35f92679 WPDB: When checking that a string can be sent to MySQL, we shouldn't use `mb_convert_encoding()`, as it behaves differently to MySQL's character encoding conversion.
Merge of [32364] to the 4.0 branch.

Props mdawaffe, pento, nbachiyski, jorbin, johnjamesjacoby, jeremyfelt.

See #32165.

Built from https://develop.svn.wordpress.org/branches/4.0@32388


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 19:09:39 +00:00
Andrew Ozz d6df175451 TinyMCE: work-around a bug in the tags matching regex.
For 4.0.
Built from https://develop.svn.wordpress.org/branches/4.0@32372


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32342 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 05:34:38 +00:00
Gary Pendergast 4fe0310d7a 4.0:
- WPDB: Sanity check that any strings being stored in the DB are not too long to store correctly.
- When upgrading, remove any suspicious comments.


Built from https://develop.svn.wordpress.org/branches/4.0@32313


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32284 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-27 17:17:37 +00:00
Gary Pendergast 4b6fa85282 4.0 branch is now 4.0.4.
Built from https://develop.svn.wordpress.org/branches/4.0@32302


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-27 14:11:37 +00:00
Helen Hou-Sandí 8254664893 The 4.0 branch is now 4.0.3.
Built from https://develop.svn.wordpress.org/branches/4.0@32283


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-23 21:35:37 +00:00
Gary Pendergast 488576e125 WPDB: When sanity checking a string by sending it to MySQL for conversion checks, the incorrect data structure was being returned from wpdb::strip_invalid_text(), causing all write queries to fail for some character sets when the query contained non-ASCII characters.
Merge of [32261] to the 4.0 branch.

See #32051.


Built from https://develop.svn.wordpress.org/branches/4.0@32272


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32243 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-23 11:44:39 +00:00
Gary Pendergast e20485b9cb WPDB: When deciding if a query needs extra sanity checking based on collation, return early when we can. Merges [32232] and [32233] to the 4.0 branch.
See #32029.


Built from https://develop.svn.wordpress.org/branches/4.0@32235


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 06:19:40 +00:00
Gary Pendergast 530a462ba1 Fix some `wpdb::check_safe_collation()` calls missed in [32181].
Built from https://develop.svn.wordpress.org/branches/4.0@32225


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 19:06:42 +00:00
Gary Pendergast d4d995bb8e Bump 4.0 branch to 4.0.2.
Built from https://develop.svn.wordpress.org/branches/4.0@32219


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 17:40:10 +00:00
Gary Pendergast 2af7429643 In Multisite, prevent plugins from unintentionally switching sites. Merge of [32173] to the 4.0 branch.
Props mdawaffe, pento.


Built from https://develop.svn.wordpress.org/branches/4.0@32199


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 13:20:36 +00:00
Gary Pendergast c5dbb01a4c Update the Plupload Flash file to the latest version. Merge of [32168] to the 4.0 branch.
Props azaozz.


Built from https://develop.svn.wordpress.org/branches/4.0@32197


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32170 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 13:04:35 +00:00
Gary Pendergast 766a6f6fa1 Remove some old backwards compatibility code from TinyMCE. Merge of [32166] to the 4.0 branch.
Props azaozz.


Built from https://develop.svn.wordpress.org/branches/4.0@32193


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32166 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 12:49:33 +00:00
Gary Pendergast 3170d00fa6 Clean up some edge cases in `sanitize_sql_orderby()`. Merge of [32164] to the 4.0 branch.
Props vortfu, dd32.


Built from https://develop.svn.wordpress.org/branches/4.0@32189


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32162 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 12:32:39 +00:00
Gary Pendergast 55be6d3e44 `wpdb::$checking_collation` was incorrectly marked as `protected` instead of `private` in [32181].
Built from https://develop.svn.wordpress.org/branches/4.0@32184


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 11:21:35 +00:00
Gary Pendergast 548201e950 Merge the query sanity checks from #21212 to the 4.0 branch.
Props pento, nacin, mdawaffe, DrewAPicture.


Built from https://develop.svn.wordpress.org/branches/4.0@32181


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 10:54:40 +00:00
Gary Pendergast 285af6e86c The 4.0 branch is now 4.0.2-alpha.
Built from https://develop.svn.wordpress.org/branches/4.0@32153


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 03:34:41 +00:00
Gary Pendergast be559a4584 Backport the PHPUnit test fixes from [31622] to the 4.0 branch.
Props boonebgorges.

See #31537.

Built from https://develop.svn.wordpress.org/branches/4.0@32148


git-svn-id: http://core.svn.wordpress.org/branches/4.0@32126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-19 07:43:42 +00:00
Andrew Nacin e34cfb7c73 Undo changes to the 4.0 branch caused by clean-css 2.2.8 (branch) versus 2.2.16 (trunk).
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30472 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 17:41:01 +00:00
Andrew Nacin d9f6f1c2ea 4.0.1 version bumps.
Built from https://develop.svn.wordpress.org/branches/4.0@30475


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30466 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 16:32:32 +00:00
Andrew Nacin 39c7ff2304 Prevent high resource usage when hashing large passwords. props mdawaffe, pento
Merges [30466] to the 4.0 branch.

Built from https://develop.svn.wordpress.org/branches/4.0@30467


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 16:05:39 +00:00
Andrew Nacin d9cd72430f Anchor texturize to shortcodes to improve regex efficiency.
For the 4.0 branch; see [30449] for trunk.

props miqrogroove.
see #29557 for segfault issues.

Built from https://develop.svn.wordpress.org/branches/4.0@30450


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30444 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 14:30:37 +00:00
Andrew Nacin be45cc1d6a Better validation of the URL used in core HTTP requests.
Merges [30443] to the 4.0 branch.

Built from https://develop.svn.wordpress.org/branches/4.0@30444


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 14:01:52 +00:00
Andrew Nacin 50a4318776 TinyMCE: Verify HTML in captions. props azaozz
Merges [30435] to the 4.0 branch.

Built from https://develop.svn.wordpress.org/branches/4.0@30436


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30431 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 13:50:41 +00:00
Andrew Nacin 65ac1b9a84 Invalidate password keys when a user's email changes.
Merges [30430] to the 4.0 branch.

Built from https://develop.svn.wordpress.org/branches/4.0@30431


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 13:40:53 +00:00
Andrew Nacin 5fcfb73bf6 Fix typo in style filter. props miqrogroove
Merges [30425] to the 4.0 branch.

Built from https://develop.svn.wordpress.org/branches/4.0@30426


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30421 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 13:16:29 +00:00
Andrew Nacin dd9f42a1f6 Playlists are video by default. props duck_
Merges [30422] to the 4.0 branch.

Built from https://develop.svn.wordpress.org/branches/4.0@30423


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30418 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 13:12:31 +00:00
Andrew Nacin 432912f7e9 Use hash_equals() for old md5 hashes.
Merges [30412] to the 4.0 branch.

Built from https://develop.svn.wordpress.org/branches/4.0@30413


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30408 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 12:02:35 +00:00
Andrew Nacin 3a108f5bce Media Grid: Don't attempt to delete an attachment that can't be deleted.
Merges [29755] to the 4.0 branch.

props wonderboymusic.
fixes #29597.

Built from https://develop.svn.wordpress.org/branches/4.0@30409


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 11:09:32 +00:00
Andrew Nacin e2cf18d5b9 Don't display Edit links for attachments user cannot edit.
Merges [29723] to the 4.0 branch.

props skaeser.
fixes #29596.

Built from https://develop.svn.wordpress.org/branches/4.0@30408


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 11:07:36 +00:00
Andrew Nacin 94f0e4dfb6 Media Grid: when the modal is open, don't respond to arrow keys when `<textarea>` has focus.
Merges [29777] (and [30378]) to the 4.0 branch.

Props ryelle, adamsilverstein.
Fixes #29725.

Built from https://develop.svn.wordpress.org/branches/4.0@30407


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 11:06:29 +00:00
Andrew Nacin 3f256ab656 TinyMCE: fix image captions regexp when wpautop is disabled in wp_editor().
Merges [29730] to the 4.0 branch.

props azaozz.
fixes #29592.

Built from https://develop.svn.wordpress.org/branches/4.0@30406


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 11:00:51 +00:00
Andrew Nacin 0e76113043 In get_adjacent_post(), $excluded_terms should check term_id rather than term_taxonomy_id.
Merges [30263] (and [30264] [30401]) to the 4.0 branch.

props boonebgorges.
fixes #29663, see #22112.

Built from https://develop.svn.wordpress.org/branches/4.0@30405


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 10:59:35 +00:00
Andrew Nacin 59ae9aa3a7 Media Frames: Set the box-sizing CSS property to border-box for checkboxes and radio buttons.
Merges [29727] to the 4.0 branch.

props mlteal.
fixes #29493.

Built from https://develop.svn.wordpress.org/branches/4.0@30262


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 13:24:42 +00:00