Commit Graph

15796 Commits

Author SHA1 Message Date
Dominik Schilling d38d60223d XMLRPC: Don't allow private posts to be sticky.
Merge of [33325], [33612], and [34135] to the 4.1 branch.

See #20662.
Built from https://develop.svn.wordpress.org/branches/4.1@34153


git-svn-id: http://core.svn.wordpress.org/branches/4.1@34121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-14 23:01:22 +00:00
Nikolay Bachiyski 76e13dd238 Shortcodes: don't allow unclosed HTML elements in attributes
Merges [34134] for 4.1 branch

Built from https://develop.svn.wordpress.org/branches/4.1@34146


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

Props dustinbolton, pento.

See #33470.


Built from https://develop.svn.wordpress.org/branches/4.1@33993


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

Props pento, dd32.

See #33154.


Built from https://develop.svn.wordpress.org/branches/4.1@33973


git-svn-id: http://core.svn.wordpress.org/branches/4.1@33942 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-09 06:06:23 +00:00
Dominik Schilling 9460b427a2 Bump 4.1 branch to version 4.1.7.
Built from https://develop.svn.wordpress.org/branches/4.1@33574


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

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

Built from https://develop.svn.wordpress.org/branches/4.1@33564


git-svn-id: http://core.svn.wordpress.org/branches/4.1@33531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 07:17:21 +00:00
Dominik Schilling 738c837a58 Comments: IDs are integers.
Merge of [33555] to the 4.1 branch.
Built from https://develop.svn.wordpress.org/branches/4.1@33557


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


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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@33504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 04:52:35 +00:00
Dominik Schilling 3b8a94550b Nav menus: Consistent titles in widgets.
Merge of [33529] to the 4.1 branch.
Built from https://develop.svn.wordpress.org/branches/4.1@33530


git-svn-id: http://core.svn.wordpress.org/branches/4.1@33497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-03 20:58:03 +00:00
Andrew Ozz 922040e867 Backport r33469 and r33470 to 4.1.
See #33106.
Built from https://develop.svn.wordpress.org/branches/4.1@33521


git-svn-id: http://core.svn.wordpress.org/branches/4.1@33488 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-31 01:43:23 +00:00
Gary Pendergast cec063ad22 WPDB: When checking the encoding of strings against the database, make sure we're only relying on the return value of strings that were sent to the database. Also make sure that we're not trying to sanity check strings that've been marked as not needing sanity checking.
Merge of [33455] to the 4.1 branch.

See #32279.


Built from https://develop.svn.wordpress.org/branches/4.1@33480


git-svn-id: http://core.svn.wordpress.org/branches/4.1@33447 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-29 06:49:21 +00:00
Gary Pendergast 50e855410b WPDB: `::strip_text_from_query()` doesn't pass a length to `::strip_invalid_text()`, which was causing queries to fail when they contained characters that needed to be sanity checked by MySQL.
Props dd32, mdawaffe, pento.

Merges [33310] to the 4.1 branch.

See #32279.

Built from https://develop.svn.wordpress.org/branches/4.1@33479


git-svn-id: http://core.svn.wordpress.org/branches/4.1@33446 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-29 06:46:21 +00:00
Gary Pendergast 0f529b177c WPDB: Remove some of the complexities in `::strip_invalid_text()` associated with switching character sets between queries. Instead of trying to dynamically change connection character sets, we now rely on the value of `::charset`. This also fixes the case where queries were being blocked when `DB_CHARSET` was `utf8`, but the column character set was non-`utf8`.
Merge of [33308] to the 4.1 branch.

See #32165.


Built from https://develop.svn.wordpress.org/branches/4.1@33478


git-svn-id: http://core.svn.wordpress.org/branches/4.1@33445 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-29 06:35:21 +00:00
Gary Pendergast eb9a250ae8 WPDB: When checking that text isn't too long to insert into a column, `LONGTEXT` columns could fail, as their length is longer than `PHP_INT_MAX`. Treating their length as a `float` instead of an `int` fixes this.
Merge of [33276] to the 4.1 branch.

See #32165.


Built from https://develop.svn.wordpress.org/branches/4.1@33477


git-svn-id: http://core.svn.wordpress.org/branches/4.1@33444 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-29 06:29:22 +00:00
Gary Pendergast fae5374051 Bump 4.1 branch to version 4.1.6.
Built from https://develop.svn.wordpress.org/branches/4.1@33396


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

Props miqrogroove.

See #15694.


Built from https://develop.svn.wordpress.org/branches/4.1@33380


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


Built from https://develop.svn.wordpress.org/branches/4.1@33375


git-svn-id: http://core.svn.wordpress.org/branches/4.1@33346 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-23 03:54:21 +00:00
Dominik Schilling 3aa108639d 4.1.5 version bumps.
Built from https://develop.svn.wordpress.org/branches/4.1@32425


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32395 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 22:18:23 +00:00
John Blackbourn 4d1c0c85a6 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.1 branch.

Props pento, willstedt for the initial patch.

See #32090.

Built from https://develop.svn.wordpress.org/branches/4.1@32412


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 21:02:23 +00:00
Dominik Schilling dc0748284b 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.1 branch.

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


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

props pento.
See #32204.

Built from https://develop.svn.wordpress.org/branches/4.1@32396


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32366 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 19:42:23 +00:00
Michael Adams bb96e5b686 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.1 branch.

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

See #32165.

Built from https://develop.svn.wordpress.org/branches/4.1@32387


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32357 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 19:07:25 +00:00
Andrew Ozz f70e3c08da TinyMCE: work-around a bug in the tags matching regex.
For 4.1.
Built from https://develop.svn.wordpress.org/branches/4.1@32371


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32341 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 05:33:26 +00:00
Gary Pendergast 9037f65f7a 4.1: When upgrading, remove any suspicious comments.
Built from https://develop.svn.wordpress.org/branches/4.1@32312


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32283 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-27 17:13:24 +00:00
Andrew Nacin dbe23fa6f9 WPDB: Sanity check that any strings being stored in the DB are not too long to store correctly.
Merge [32299] to the 4.1 and 4.2 branches.

Built from https://develop.svn.wordpress.org/@32307


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32278 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-27 15:31:44 +00:00
Gary Pendergast b502bf4430 4.1 branch is now 4.1.4.
Built from https://develop.svn.wordpress.org/branches/4.1@32301


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-27 14:07:23 +00:00
Helen Hou-Sandí 5f82891015 The 4.1 branch is now 4.1.3.
Built from https://develop.svn.wordpress.org/branches/4.1@32281


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32252 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-23 19:57:25 +00:00
Gary Pendergast ee5a9ef1a0 The 4.1 branch is now 4.1.3-RC1.
Built from https://develop.svn.wordpress.org/branches/4.1@32263


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32234 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 15:06:22 +00:00
Gary Pendergast 08c78f29d4 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.1 branch.

See #32051.

Built from https://develop.svn.wordpress.org/branches/4.1@32262


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32233 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 15:05:22 +00:00
Gary Pendergast d110b87090 The 4.1 branch is now 4.1.2.
Built from https://develop.svn.wordpress.org/branches/4.1@32244


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32215 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 14:18:26 +00:00
Gary Pendergast e467eb6c93 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.1 branch.
See #32029.


Built from https://develop.svn.wordpress.org/branches/4.1@32234


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32208 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 05:44:23 +00:00
Helen Hou-Sandí ecd58ab7d2 The 4.1 branch is 4.1.2-RC1.
Built from https://develop.svn.wordpress.org/branches/4.1@32226


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 19:38:24 +00:00
Gary Pendergast 97d7fd2cec Fix an incorrect method name in 4.1, introduced in [32163].
Built from https://develop.svn.wordpress.org/branches/4.1@32223


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 18:40:22 +00:00
Gary Pendergast 877ff2ec15 Bump 4.1 branch to 4.1.2.
Built from https://develop.svn.wordpress.org/branches/4.1@32221


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32195 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 17:41:46 +00:00
Gary Pendergast 6ecee8c8d5 Fix an incorrect PHPDoc added in [32163].
Built from https://develop.svn.wordpress.org/branches/4.1@32187


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32160 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 11:33:23 +00:00
Gary Pendergast 62c3bf486b `wpdb::$checking_collation` was incorrectly marked as `protected` instead of `private` in [32163].
Built from https://develop.svn.wordpress.org/branches/4.1@32183


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32156 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 11:17:24 +00:00
Gary Pendergast 7d6b8c0a89 In Multisite, prevent plugins from unintentionally switching sites. Merge of [32173] to the 4.1 branch.
Props mdawaffe.


Built from https://develop.svn.wordpress.org/branches/4.1@32174


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32149 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 07:30:25 +00:00
Gary Pendergast bc58804ad3 Revert [30640], as it was incorrectly checking some filenames. This merges [32171] in the 4.1 branch.
See #30377.


Built from https://develop.svn.wordpress.org/branches/4.1@32172


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


Built from https://develop.svn.wordpress.org/branches/4.1@32169


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32144 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 06:16:23 +00:00
Gary Pendergast 93eba2d6f9 Remove some old backwards compatibility code from TinyMCE. Merge of [32166] to the 4.1 branch.
Props azaozz.


Built from https://develop.svn.wordpress.org/branches/4.1@32167


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 05:53:23 +00:00
Gary Pendergast 96cffc1a02 Clean up some edge cases in `sanitize_sql_orderby()`. Merge of [32164] to the 4.1 branch.
Props vortfu, dd32.


Built from https://develop.svn.wordpress.org/branches/4.1@32165


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 05:46:22 +00:00
Gary Pendergast a10714c271 Merge the query sanity checks from #21212 to the 4.1 branch.
Props pento, nacin, mdawaffe, DrewAPicture.


Built from https://develop.svn.wordpress.org/branches/4.1@32163


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32138 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 05:08:23 +00:00
Gary Pendergast 93644991eb The 4.1 branch is now 4.1.2-alpha.
Built from https://develop.svn.wordpress.org/branches/4.1@32144


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32124 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-19 05:27:26 +00:00
Andrew Nacin da742c0489 Bump $tinymce_version in the 4.1 branch.
Built from https://develop.svn.wordpress.org/branches/4.1@31477


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-18 22:08:23 +00:00
Andrew Nacin 29a8d70a31 Update @since in [31084]. see #30843.
Built from https://develop.svn.wordpress.org/branches/4.1@31476


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31457 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-18 21:56:23 +00:00
Helen Hou-Sandí 4a877ade5a Revert [31198] from the 4.1 branch, as it is an incomplete fix that introduces more problems than the tiny issue it was attempting to solve.
see #30725.

Built from https://develop.svn.wordpress.org/branches/4.1@31468


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-17 14:11:25 +00:00
Dion Hulse 4ff80ae587 Fix the display of Audio and Video in the Media Library when using IE8 and below.
This delays the execution of instantiating of the MediaElement.js player until the render is complete, and the node is in the DOM.
Although it's a bug that this is needed in the first place, this will cover us until a new MediaElement.ks release is made.

Props afercia.
Fixes #31058 for 4.1.

Built from https://develop.svn.wordpress.org/branches/4.1@31444


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-13 05:54:26 +00:00
Dion Hulse 8518481173 TinyMCE: ensure the image toolbar stays visible when the image is much wider than the editor.
Props iseulde.
Merges [31362] to the 4.1 branch.
Fixes #30696.

Built from https://develop.svn.wordpress.org/branches/4.1@31437


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31418 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 06:02:24 +00:00
Dion Hulse 1c36669bce TinyMCE: select the iframe element by id. Needed as some browser extensions insert extra elements in the page.
Props iseulde.
Merges [31180] to the 4.1 branch.
Fixes #30785.

Built from https://develop.svn.wordpress.org/branches/4.1@31436


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31417 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 06:00:23 +00:00