28520 Commits

Author SHA1 Message Date
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
Michael Adams
3989e1f450 Upgrade: $wpdb->get_col_length() sanity check: bail on unexpected return value.
Merges [32429] for the 4.1 branch.

See #32165.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 23:13:22 +00:00
Dominik Schilling
3e3300395a Add closing paragraph tag for the 4.1.5 changelog entry.
Built from https://develop.svn.wordpress.org/branches/4.1@32428


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 23:04:23 +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
Michael Adams
2b8283ed89 Upgrade: Ensure unintelligible DB schemas don't result in content loss.
Merge of [32417] to the 4.1 branch.

See #32165.

Props ocean90.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32389 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 21:51:24 +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
Aaron Jorbin
26563868af When upgrading WordPress remove genericons example.html files
[32385] for 4.1 branch

Props @dd32, @boonebgorges, @johnjamesjacoby, @drewapicture, @jorbin


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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 19:58:22 +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
Dominik Schilling
4f3aedcdbe Bundled Themes: Remove Genericons example.html files.
Merge [32392] to the 4.1 branch.
Built from https://develop.svn.wordpress.org/branches/4.1@32394


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 19:34:22 +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
40fd7427e5 4.1: Update about.php.
Built from https://develop.svn.wordpress.org/branches/4.1@32220


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32194 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 17:41:23 +00:00
Helen Hou-Sandí
02b9d848a2 Update Akismet external to 3.1.1 in the 4.1 branch.
git-svn-id: http://core.svn.wordpress.org/branches/4.1@32185 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 16:23:32 +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
9d3a4d67c2 Ensure post titles are correctly escaped on the Dashboard. Merge of [32175] to the 4.1 branch.
Props helen, ocean90, dd32, pento.


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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 07:42:23 +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
931498f871 readme.html bump.
Built from https://develop.svn.wordpress.org/branches/4.1@32146


git-svn-id: http://core.svn.wordpress.org/branches/4.1@32125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-19 05:35: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
609c6ecd6c Update Akismet to 3.1 in the 4.1 branch.
git-svn-id: http://core.svn.wordpress.org/branches/4.1@31772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-16 02:12:24 +00:00
Dion Hulse
ae731c8312 Upgrades: Specifically pass the 'version' and 'locale' POST vars through the Core Update FTP credentials form.
This bug was introduced with [30384] / #30245.
Merges [31527] to the 4.1 branch.
Fixes #31378.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-24 03:24:25 +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
Andrew Nacin
67990a8e87 Remove errant string.
Built from https://develop.svn.wordpress.org/branches/4.1@31475


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-18 21:46:22 +00:00
Dominik Schilling
49ec4553c3 About: Add changelog for 4.1.1.
Built from https://develop.svn.wordpress.org/branches/4.1@31474


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31455 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-18 20:25: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