Commit Graph

28509 Commits

Author SHA1 Message Date
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
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
Dion Hulse 0c28c25442 Revert [31080] from the 4.1 branch and replace it with a small function in an already changed file.
By doing this, we avoid shipping 400KB of changed CSS for such a minor css addition.

See https://build.trac.wordpress.org/changeset/31061 for the full size of [31080] in build.
See #30895.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 05:37:22 +00:00
Dion Hulse f7eb6f17e3 Move the (recently added) `.notice` admin notices below the first H2, same as the `.updated` and `.error` notices.
Props sippis.
Merges [31023] to the 4.1 branch.
Fixes #30885.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31415 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 05:21:22 +00:00
Dion Hulse e2825e3004 In `paginate_links()`, don't override custom format arguments when setting up default 'add_args'.
Since 4.1 [29780], the default value of the 'add_args' argument in
paginate_links() has been determined by parsing the current URL. This change
had the side effect of overriding custom values of 'format' that changed the
pagination query var, with the result that plugins using `paginate_links()`
with a custom format generated the incorrect links unless explicitly
declaring 'add_args=false' to prevent the default values from overriding. We
fix this behavior by parsing URL query vars into the 'add_args' array only
after the explicit function params have been parsed, and by skipping the
current page's pagination query var when doing this parsing (to avoid the
override).

Props obenland.
Merges [31203], [31432] to the 4.1 branch.
Fixes #30831.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 02:20:22 +00:00
Dion Hulse f7b1a10f47 Bump 4.1.1 version numbers & dates.
Built from https://develop.svn.wordpress.org/branches/4.1@31431


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 01:35:22 +00:00
Dion Hulse 281b8022e1 Prevent IE9 and lower displaying the download file dialogue when attempting
to upload using the `html4` Plupload handler.

The HTML4 Plupload handler uses a hidden iframe to POST the upload form, and
unfortunately Internet Explorer 9 doesn't support the `application/json`
content-type which `wp_send_json_success()` and requires `text/html` instead.

This partially reverts [30354], keeping the better error messages.

Merges [31429] to the 4.1 branch.
Fixes #31037.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 01:33:24 +00:00
Dion Hulse d349b9fdaf Ensure that `WP_Customize_Setting::value()` returns default value for setting if not dirty.
There was regression introduced by #28580 where only changed (dirty) settings now are POST'ed to the Customizer preview.

* Allow WP_Customize_Manager::post_value() to accept a second $default argument.
* Introduce WP_Customize_Manager::unsanitized_post_values() for accessing previously-private member variable _post_values.
* Do require_once instead of require for Customizer classes.
* Add unit tests for WP_Customize_Manager and WP_Customize_Setting.

Props westonruter, boonebgorges.
Merges [31329] [31339] [31342] [31360] to the 4.1 branch.
Fixes #30988.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31391 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-11 06:25:23 +00:00
Dion Hulse a8ac7d3dc1 jQuery UI: Add missing dependencies for puff and scale effects.
Props ocean90.
Merges [31273] to the 4.1 branch.
Fixes #31113.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-10 01:46:24 +00:00
Dion Hulse 14fb3b11d6 Customizer: Improve IE 8 compatibility.
* Use square bracket notation for `default` keywords.
* Use Underscores `indexOf` for arrays.

Props westonruter, ocean90.
Merges [30991] to the 4.1 branch.
Fixes #30781.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-10 01:41:24 +00:00