Commit Graph

17018 Commits

Author SHA1 Message Date
John Blackbourn
63cc2673a1 Hardening: Add escaping to the language attributes used on html elements.
Merges [42259] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@42293


git-svn-id: http://core.svn.wordpress.org/branches/4.2@42122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-29 16:33:54 +00:00
Dion Hulse
9dadfcb012 WPDB: Check that AUTH_SALT is not empty, Fix a PHP notice when AUTH_SALT is undefined.
Props jsonfry, mkomar, pento.
Merges [42119] and [42120] to the 4.2 branch.
Fixes #42431 and #42401 for 4.2.

Built from https://develop.svn.wordpress.org/branches/4.2@42236


git-svn-id: http://core.svn.wordpress.org/branches/4.2@42065 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-27 01:12:56 +00:00
Gary Pendergast
eb5a635d04 Bump 4.2 branch to version 4.3.17.
Built from https://develop.svn.wordpress.org/branches/4.2@42075


git-svn-id: http://core.svn.wordpress.org/branches/4.2@41904 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-10-31 13:42:30 +00:00
Gary Pendergast
86acf8b033 Database: Restore numbered placeholders in wpdb::prepare().
[41496] removed support for numbered placeholders in queries send through `wpdb::prepare()`, which, despite being undocumented, were quite commonly used.

This change restores support for numbered placeholders (as well as a subset of placeholder formatting), while also adding extra checks to ensure the correct number of arguments are being passed to `wpdb::prepare()`, given the number of placeholders.

Merges [41662], [42056] to the 4.2 branch.
See #41925.


Built from https://develop.svn.wordpress.org/branches/4.2@42063


git-svn-id: http://core.svn.wordpress.org/branches/4.2@41892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-10-31 12:51:31 +00:00
Dominik Schilling
c4fb8dfbf1 Bump 4.2 branch to version 4.2.16.
Built from https://develop.svn.wordpress.org/branches/4.2@41516


git-svn-id: http://core.svn.wordpress.org/branches/4.2@41349 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-09-19 20:03:31 +00:00
Aaron Campbell
a964c2ba2e Database: Hardening to bring wpdb::prepare() inline with documentation.
`wpdb::prepare()` supports %s, %d, and %F as placeholders in the query string. Any other non-escaped % will be escaped.

Merges [41496] to 4.2 branch.


Built from https://develop.svn.wordpress.org/branches/4.2@41503


git-svn-id: http://core.svn.wordpress.org/branches/4.2@41336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-09-19 18:31:29 +00:00
Aaron Campbell
79e0bb13d4 Database: Don’t trigger _doing_it_wrong() for null values in wpdb::prepare().
While `wpdb::prepare()` does not support null values (see #12819) they still appear in the wild like in the WordPress Importer and other plugins.

Merges [41483] to 4.2 branch.


Built from https://develop.svn.wordpress.org/branches/4.2@41490


git-svn-id: http://core.svn.wordpress.org/branches/4.2@41323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-09-19 16:25:54 +00:00
Aaron Campbell
be9edc6bc3 Database: Hardening for wpdb::prepare()
Previously if you passed an array of values for placeholders, additional values could be passed as well. Now additional values will be ignored.

Merges [41470] to 4.2 branch.


Built from https://develop.svn.wordpress.org/branches/4.2@41477


git-svn-id: http://core.svn.wordpress.org/branches/4.2@41310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-09-19 15:03:30 +00:00
Dominik Schilling
74df39530d TinyMCE: Improve the previews for shortcodes.
Merge of [41395] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@41441


git-svn-id: http://core.svn.wordpress.org/branches/4.2@41274 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-09-19 12:44:31 +00:00
Dominik Schilling
ecf502b597 Editor: Prevent adding javascript: and data: URLs through the inline link dialog.
Merge of [41393] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@41406


git-svn-id: http://core.svn.wordpress.org/branches/4.2@41239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-09-19 10:19:28 +00:00
Aaron Campbell
a01117bf0d Bump 4.2 branch to version 4.2.15.
Built from https://develop.svn.wordpress.org/branches/4.2@40753


git-svn-id: http://core.svn.wordpress.org/branches/4.2@40611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-05-16 21:52:23 +00:00
Pascal Birchler
7f8136dfd7 Media: Simplify upload error message construction.
Merges [40736] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@40742


git-svn-id: http://core.svn.wordpress.org/branches/4.2@40600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-05-16 18:03:56 +00:00
Dominik Schilling
8f47014af6 Customize: Ignore invalid customization sessions.
Merge of [40704] to the 4.2 branch.
Built from https://develop.svn.wordpress.org/branches/4.2@40710


git-svn-id: http://core.svn.wordpress.org/branches/4.2@40573 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-05-16 12:19:29 +00:00
Pascal Birchler
92f3fdb956 Adjust post meta checks
Merges [40692] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@40698


git-svn-id: http://core.svn.wordpress.org/branches/4.2@40561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-05-16 08:52:55 +00:00
Pascal Birchler
7fc612abfb Whitelist post arguments in XML-RPC
Merges [40677] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@40683


git-svn-id: http://core.svn.wordpress.org/branches/4.2@40546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-05-16 08:24:31 +00:00
Pascal Birchler
5565b98dde Bump 4.2 branch to version 4.2.14.
Built from https://develop.svn.wordpress.org/branches/4.2@40492


git-svn-id: http://core.svn.wordpress.org/branches/4.2@40368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-04-20 16:26:30 +00:00
James Nylen
b9a98e7562 Bump 4.2 branch to version 4.2.13.
Built from https://develop.svn.wordpress.org/branches/4.2@40207


git-svn-id: http://core.svn.wordpress.org/branches/4.2@40146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-03-06 16:32:30 +00:00
Aaron Campbell
db266e95e1 Strip control characters before validating redirect.
Merges [40183] to 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@40189


git-svn-id: http://core.svn.wordpress.org/branches/4.2@40128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-03-06 13:44:24 +00:00
Dominik Schilling
462631b8cc Embeds: URL encode YouTube video IDs for broader compatibility.
Merge of [40160] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@40166


git-svn-id: http://core.svn.wordpress.org/branches/4.2@40105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-03-06 12:07:35 +00:00
Aaron Campbell
f449b0a0ce Bump 4.2 branch to version 4.2.12.
Built from https://develop.svn.wordpress.org/branches/4.2@40001


git-svn-id: http://core.svn.wordpress.org/branches/4.2@39938 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-01-26 18:25:29 +00:00
Dominik Schilling
b7509648b8 Query: Ensure that queries work correctly with post type names with special characters.
Merge of [39952] to the 4.2 branch.
Built from https://develop.svn.wordpress.org/branches/4.2@39961


git-svn-id: http://core.svn.wordpress.org/branches/4.2@39898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-01-26 13:52:00 +00:00
Aaron Campbell
ab64033700 Bump 4.2 branch to version 4.2.11.
Built from https://develop.svn.wordpress.org/branches/4.2@39865


git-svn-id: http://core.svn.wordpress.org/branches/4.2@39802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-01-11 16:58:29 +00:00
Joe McGill
073c7e6092 Media: Fix exif_imagetype check in wp_get_image_mime
This is a follow up to [39831].

Merges [39850] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@39856


git-svn-id: http://core.svn.wordpress.org/branches/4.2@39793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-01-11 16:43:32 +00:00
Joe McGill
99f9d45c10 Media: Improve image filetype checking.
This adds a new function `wp_get_image_mime()` which is used by
`wp_check_filetype_and_ext()` to validate image files using
`exif_imagetype()` if available instead of `getimagesize()`.

`getimagesize()` is less performant than `exif_imagetype()` and is
dependent on GD. If `exif_imagetype()` is not available, it falls back to
`getimagesize()` as before.

If `wp_check_filetype_and_ext()` can't validate the filetype, we now return
`false` for ext/MIME values.

Merges [39831] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@39837


git-svn-id: http://core.svn.wordpress.org/branches/4.2@39775 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-01-11 13:18:29 +00:00
Dominik Schilling
76d93255d6 Themes: Fix markup for theme name fallbacks.
Merge of [39807] to the 4.2 branch.
Built from https://develop.svn.wordpress.org/branches/4.2@39814


git-svn-id: http://core.svn.wordpress.org/branches/4.2@39752 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-01-11 11:11:56 +00:00
Jeremy Felt
ed1586d7ff Multisite: Use wp_rand() in signup key creation.
Merges [39795] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@39801


git-svn-id: http://core.svn.wordpress.org/branches/4.2@39739 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-01-11 05:34:56 +00:00
Dion Hulse
4873f1b139 Update PHPMailer to 5.2.22.
The full list of changes is available here:
https://github.com/PHPMailer/PHPMailer/compare/v5.2.21...v5.2.22

Merges [39759] to the 4.2 branch.
Fixes #37210 for 4.2.

Built from https://develop.svn.wordpress.org/branches/4.2@39789


git-svn-id: http://core.svn.wordpress.org/branches/4.2@39727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-01-11 05:25:28 +00:00
Dion Hulse
755a765d49 Mail: Upgrade PHPMailer to 5.2.21.
Merges [39645], [36083], [33142], [33124] to the 4.2 branch.
See #37210.

Built from https://develop.svn.wordpress.org/branches/4.2@39726


git-svn-id: http://core.svn.wordpress.org/branches/4.2@39666 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-01-06 22:06:00 +00:00
Jeremy Felt
e57416e1d7 Bump 4.2 branch to 4.2.10.
Built from https://develop.svn.wordpress.org/branches/4.2@38553


git-svn-id: http://core.svn.wordpress.org/branches/4.2@38496 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-07 15:00:32 +00:00
Boone Gorges
3042245749 Bump 4.2 branch to 4.2.9.
Built from https://develop.svn.wordpress.org/branches/4.2@37831


git-svn-id: http://core.svn.wordpress.org/branches/4.2@37796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 16:36:27 +00:00
Joe McGill
754a809bfb Media: Improve handling of extensionless filenames.
Merge of [37756] to the 4.2 branch.

See #37111.
Built from https://develop.svn.wordpress.org/branches/4.2@37816


git-svn-id: http://core.svn.wordpress.org/branches/4.2@37781 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:56:48 +00:00
Nikolay Bachiyski
437f727e8f Admin: Escape attachment name in case it contains special characters
Merge of [37774] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@37789


git-svn-id: http://core.svn.wordpress.org/branches/4.2@37754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:26:11 +00:00
Jeremy Felt
0ba49c4a4c Admin: Allow for the consistent filtering of auth_redirect_scheme
Merge of [37651] to the 4.2 branch.

See #37047.

Built from https://develop.svn.wordpress.org/branches/4.2@37761


git-svn-id: http://core.svn.wordpress.org/branches/4.2@37726 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:12:47 +00:00
Dominik Schilling
94306911e2 Bump 4.2 branch to 4.2.8.
Built from https://develop.svn.wordpress.org/branches/4.2@37387


git-svn-id: http://core.svn.wordpress.org/branches/4.2@37353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-06 18:13:27 +00:00
Nikolay Bachiyski
96731bcfb4 External Libraries: Update plupload from upstream
Built from https://develop.svn.wordpress.org/branches/4.2@37379


git-svn-id: http://core.svn.wordpress.org/branches/4.2@37345 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-06 17:59:26 +00:00
Dominik Schilling
e35259b0bc External Libraries: Update MediaElement.js from upstream.
Merge of [37370] to the 4.2 branch.
Built from https://develop.svn.wordpress.org/branches/4.2@37375


git-svn-id: http://core.svn.wordpress.org/branches/4.2@37341 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-06 17:55:00 +00:00
Nikolay Bachiyski
0986b209ea Taxonomies: make sure taxonomy functions work correctly with taxonomy names with special characters
The codex says that taxonomy names "should only contain lowercase letters and the underscore character", but that's not enforced. It's too late to enforce it, since some plugins haven't been following it and the official phpdoc doesn't mention this restriction.

Merge of [37133] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@37137


git-svn-id: http://core.svn.wordpress.org/branches/4.2@37104 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 17:29:28 +00:00
Dominik Schilling
a60f6eea61 HTTP: Improve detection of valid IP addresses.
Merge of [37115] to the 4.2 branch.
Built from https://develop.svn.wordpress.org/branches/4.2@37118


git-svn-id: http://core.svn.wordpress.org/branches/4.2@37085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 15:52:12 +00:00
Nikolay Bachiyski
080ef55551 Snoopy: use escapeshellarg instead of escapeshellcmd
We are escaping arguments, not commands, so we'd better use the semantically correct function, even though they are similar.

Merges [37094] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@37097


git-svn-id: http://core.svn.wordpress.org/branches/4.2@37064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 14:08:28 +00:00
Dominik Schilling
666b9f8558 Bump 4.2 branch to 4.2.7.
Built from https://develop.svn.wordpress.org/branches/4.2@36457


git-svn-id: http://core.svn.wordpress.org/branches/4.2@36424 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-02 17:28:49 +00:00
Dominik Schilling
c1769766f6 Better validation of the URL used in HTTP redirects.
Merges [36444] to the 4.2 branch.
Built from https://develop.svn.wordpress.org/branches/4.2@36449


git-svn-id: http://core.svn.wordpress.org/branches/4.2@36416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-02 17:00:28 +00:00
Dominik Schilling
c30865a6b5 HTTP: 0.1.2.3 is not a valid IP.
Merges [36435] to the 4.2 branch.
Built from https://develop.svn.wordpress.org/branches/4.2@36438


git-svn-id: http://core.svn.wordpress.org/branches/4.2@36405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-02 13:04:20 +00:00
Dominik Schilling
c897bed043 Bump 4.2 branch to 4.2.6.
Built from https://develop.svn.wordpress.org/branches/4.2@36198


git-svn-id: http://core.svn.wordpress.org/branches/4.2@36165 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-06 18:49:27 +00:00
Aaron Jorbin
f26900d209 Theme: Escape error messages
[36185] for 4.2 branch

Built from https://develop.svn.wordpress.org/branches/4.2@36188


git-svn-id: http://core.svn.wordpress.org/branches/4.2@36155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-06 17:26:28 +00:00
Dion Hulse
5686506414 Background Updates: Remove the 7am/7pm background update check.
This changeset is a more basic version of [36180], clearing the extra now redundant schedule.
As the functionality for this was introduced in 3.9, [28129] has been backported to 3.7/3.8, allowing the API TTL to be respected by those versions.

See #27772.
Fixes #35323.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@36151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-06 13:24:33 +00:00
Helen Hou-Sandí
ca39e38e59 Finish bumping the 4.2 branch to 4.2.5.
Built from https://develop.svn.wordpress.org/branches/4.2@34190


git-svn-id: http://core.svn.wordpress.org/branches/4.2@34158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-15 14:50:07 +00:00
Dominik Schilling
ec4db723d2 XMLRPC: Don't allow private posts to be sticky.
Merge of [33325], [33612], and [34135] to the 4.2 branch.

See #20662.
Built from https://develop.svn.wordpress.org/branches/4.2@34152


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

Built from https://develop.svn.wordpress.org/branches/4.2@34145


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

Props dustinbolton, pento.

See #33470.


Built from https://develop.svn.wordpress.org/branches/4.2@33992


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33961 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-10 06:57:28 +00:00
Gary Pendergast
6b2df3479c 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.2@33972


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33941 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-09 06:01:28 +00:00
Andrew Nacin
439841760c Bump the 4.2 branch to 4.2.5-alpha.
Built from https://develop.svn.wordpress.org/branches/4.2@33587


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-05 22:02:28 +00:00
Dominik Schilling
a4279152fc Bump 4.2 branch to version 4.2.4.
Built from https://develop.svn.wordpress.org/branches/4.2@33573


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 11:50:27 +00:00
Dominik Schilling
f59f79151e Comments: IDs are integers.
Merge of [33555] to the 4.2 branch.
Built from https://develop.svn.wordpress.org/branches/4.2@33556


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 04:59:00 +00:00
Dominik Schilling
e2e6972945 Themes: Fix some broken links in the legacy theme preview.
Built from https://develop.svn.wordpress.org/branches/4.2@33549


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 04:56:47 +00:00
Dominik Schilling
008c4fe3c4 Customizer: Use hash_equals() for widgets.
Merge of [33535] to the 4.2 branch.
Built from https://develop.svn.wordpress.org/branches/4.2@33536


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33503 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 04:52:16 +00:00
Dominik Schilling
ddf451dbb5 Nav menus: Consistent titles in widgets.
Built from https://develop.svn.wordpress.org/branches/4.2@33529


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33496 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-03 20:57:42 +00:00
Helen Hou-Sandí
5198ab8672 The 4.2 branch is now 4.2.4-RC1.
Built from https://develop.svn.wordpress.org/branches/4.2@33520


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33487 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-30 20:39:26 +00:00
Andrew Ozz
373ba799c3 Backport r33469 and r33470 to 4.2.
See #33106.
Built from https://develop.svn.wordpress.org/branches/4.2@33518


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-30 19:41:27 +00:00
Andrew Ozz
ce7113bc3e Fix do_shortcode('<[shortcode]') edge case.
Props miqrogroove. Fixes #33116 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@33499


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33466 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-29 20:07:27 +00:00
Gary Pendergast
c58e9ddf35 Don't blindly trust the output of glob() to be an array.
Props kitchin.

Merge of [33447] to the 4.2 branch.

Fixes #33093.


Built from https://develop.svn.wordpress.org/branches/4.2@33481


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33448 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-29 06:53:28 +00:00
Gary Pendergast
371f520a52 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.2 branch.

See #32279.


Built from https://develop.svn.wordpress.org/branches/4.2@33476


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-29 06:22:27 +00:00
Gary Pendergast
d8eb8da38a Bump 4.2 branch to version 4.2.3.
Built from https://develop.svn.wordpress.org/branches/4.2@33395


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-23 11:03:27 +00:00
Gary Pendergast
68c10bf9e1 Bump 4.2 branch version to 4.2.3-beta1.
Built from https://develop.svn.wordpress.org/branches/4.2@33361


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-22 05:51:27 +00:00
Gary Pendergast
4cd2612edc Shortcodes: Improve the reliablity of shortcodes inside HTML tags.
Merge of [33359] to the 4.2 branch.

Props miqrogroove.

See #15694.


Built from https://develop.svn.wordpress.org/branches/4.2@33360


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


Built from https://develop.svn.wordpress.org/branches/4.2@33358


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-22 04:06:28 +00:00
Gary Pendergast
85e880b5b2 sanitize_option() needs to handle WP_Error. DRY the conditional calls to add_settings_error().
Merge of [32791] to the 4.2 branch.

Props wonderboymusic, chriscct7 for an initial patch.

Fixes #32350.


Built from https://develop.svn.wordpress.org/branches/4.2@33326


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-19 23:26:27 +00:00
Andrew Ozz
78fc515bf3 TinyMCE wpView: preserve HTML wrapped in shortcodes.
Props iseulde, azaozz. Fixes #32078 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@33316


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33288 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-17 22:02:26 +00:00
Andrew Ozz
9a74f7c01a Check if running from /src or SCRIPT_DEBUG is defined in print_emoji_detection_script().
Fixes #32118 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@33315


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-17 21:40:27 +00:00
Andrew Ozz
22e22a3db7 TinyMCE: wpView: fix typo in createInstance that prevented instances from being reused.
Props iseulde. Fixes #32591 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@33314


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33286 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-17 21:22:27 +00:00
Andrew Ozz
72a321196e Emoji: do not try to replace emoji chars inside SVGs.
Fixes #32305 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@33312


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33284 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-17 20:17:27 +00:00
Gary Pendergast
0300e1f14a 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.2 branch.

Fixes #32279.


Built from https://develop.svn.wordpress.org/branches/4.2@33311


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33283 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-17 07:10:28 +00:00
Gary Pendergast
8429597071 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.2 branch.

Fixes #32165.


Built from https://develop.svn.wordpress.org/branches/4.2@33309


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33281 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-17 06:38:29 +00:00
Gary Pendergast
722c40dda7 In comment_form(), ensure that filtered arguments contain all required default values.
Merge of [32511] to the 4.2 branch.

Props boonebgorges.
Fixes #32312.


Built from https://develop.svn.wordpress.org/branches/4.2@33307


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33279 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-17 06:14:26 +00:00
Gary Pendergast
19aa985476 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.2 branch.

See #32165.


Built from https://develop.svn.wordpress.org/branches/4.2@33277


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-15 04:40:29 +00:00
Gary Pendergast
c43baf9ef4 WPDB: When extracting the table name from a query, we had a 1000 character limit on the SQL string that would be searched. This was a hangover from when the code was imported from HyperDB, and isn't appropriate for Core, where a wider range of queries are likely to be run.
Merges [33259] to the 4.2 branch.

Fixes #32763


Built from https://develop.svn.wordpress.org/branches/4.2@33260


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33232 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-14 10:21:26 +00:00
Dion Hulse
63f64d5909 Enable utf8mb4 for MySQL extension users. Previously utf8mb4 was limited to MySQLi users only unintentionally.
Ports [33055] to the 4.2 branch
Fixes #32127 for 4.2.3

Built from https://develop.svn.wordpress.org/branches/4.2@33063


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-03 12:44:28 +00:00
Dominik Schilling
cf02c02024 4.2 branch is now 4.2.3-alpha.
Built from https://develop.svn.wordpress.org/branches/4.2@32470


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32440 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-09 18:05:30 +00:00
Boone Gorges
e1f9360463 Remove duplicate semicolon introduced in [32384].
Built from https://develop.svn.wordpress.org/branches/4.2@32426


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32396 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 22:49:28 +00:00
Dominik Schilling
fc3a071185 4.2.2 version bumps.
Built from https://develop.svn.wordpress.org/branches/4.2@32424


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32394 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 22:07:27 +00:00
Boone Gorges
0baf141106 Attachment URLs should only be forced to SSL on the front end.
Detecting SSL status on the Dashboard introduces problems when writing content
that is saved to the database and then displayed on the front end, where SSL
may be optional (or impossible, due to self-signed certificates). The new
approach parallels the logic in `get_home_url()` for forcing HTTPS.

See [31614] #15928 for background.

Fixes #32112 for 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@32384


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32354 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 16:21:29 +00:00
Boone Gorges
80d7ad721a Improve performance of loop detection in _get_term_children().
Using an array keyed by term_id allows us to use `isset()` rather than the
 slower `in_array()`. In addition, it lets us avoid the use of `wp_list_pluck()`
 on large arrays, and helps us to avoid arrays that are unnecessarily large due
 to duplicate entries.

 Fixes #32144 for 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@32383


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 16:19:28 +00:00
Gary Pendergast
5c01870b62 Upgrades: When converting to utf8mb4, we were trying to change the wrong index on wp_signups, causing the conversion to later fail.
Merge [32378] to the 4.2 branch.

Props kovshenin, pento.

Fixes #32099.


Built from https://develop.svn.wordpress.org/branches/4.2@32380


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32350 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 07:42:28 +00:00
Gary Pendergast
5d957b7c84 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.2 branch.

See #32104.


Built from https://develop.svn.wordpress.org/branches/4.2@32377


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 07:14:29 +00:00
Gary Pendergast
8c578f0e0c The UTF-8 regex can occasionally fail on very low memory machines. Reduce the amount of memory it uses.
Merges [32375] to the 4.2 branch.

See #32204.


Built from https://develop.svn.wordpress.org/branches/4.2@32376


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32346 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 07:06:29 +00:00
Gary Pendergast
b0b230fab4 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.2 branch.

Props pento, willstedt for the initial patch.

See #32090.

Built from https://develop.svn.wordpress.org/branches/4.2@32370


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32340 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 05:17:30 +00:00
Andrew Ozz
568c4e8f56 Add some of the TinyMCE 4.1.10 fixes to 4.2.
See [32366], 32262.
Built from https://develop.svn.wordpress.org/branches/4.2@32369


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32339 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 05:12:29 +00:00
Gary Pendergast
db8f915ee6 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.2 branch.

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

See #32165.


Built from https://develop.svn.wordpress.org/branches/4.2@32367


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32337 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 03:30:30 +00:00
Andrew Ozz
c08ee82b3c TinyMCE: fix Mac keyboard shortcut for save from the visual editor.
Props iseulde. Fixes #32122 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@32363


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32334 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 02:30:27 +00:00
Andrew Ozz
6f00d59589 Emoji: add an exclude class to wp-emoji checked when monitoring for changes with MutationObserver. Use it for the hidden div used for resizing the Text editor.
Fixes #32197 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@32362


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 02:25:28 +00:00
Andrew Ozz
897691addd Emoji:
- Fix loading errors in IE9 and IE10.
- Add fallbacks for the loading events.
Fixes #32109 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@32361


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 01:35:26 +00:00
Andrew Ozz
be8bdfb795 Emoji: fix loop when replacement images fail to load.
Props iseulde. Fixes #32128 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@32360


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 01:26:28 +00:00
Gary Pendergast
a3a76fe665 4.2: When upgrading, remove any suspicious comments.
Built from https://develop.svn.wordpress.org/branches/4.2@32311


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32282 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-27 17:10:29 +00:00
Andrew Nacin
5c2b420b29 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.2@32278 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-27 15:31:44 +00:00
Gary Pendergast
f0a9d2e5a1 4.2 branch is now 4.2.1-alpha.
Built from https://develop.svn.wordpress.org/branches/4.2@32300


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32271 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-27 14:06:30 +00:00
Drew Jaynes
ca542b5d18 WordPress 4.2
Built from https://develop.svn.wordpress.org/branches/4.2@32279


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-23 16:26:10 +00:00
Helen Hou-Sandí
25a0ca9f69 About page: Finalize media for 4.2.
props ocean90, Nao.
fixes #31929.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-23 15:43:25 +00:00
Dominik Schilling
de1a9710ca Bundled Themes: Bump version numbers and update POT files.
fixes #32032.
Built from https://develop.svn.wordpress.org/trunk@32276


git-svn-id: http://core.svn.wordpress.org/trunk@32247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-23 15:16:29 +00:00
Drew Jaynes
56844afe5d Post 4.2-RC4 bump
Built from https://develop.svn.wordpress.org/trunk@32271


git-svn-id: http://core.svn.wordpress.org/trunk@32242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 20:30:32 +00:00
Drew Jaynes
cc78355523 WordPress 4.2-RC4
Built from https://develop.svn.wordpress.org/trunk@32270


git-svn-id: http://core.svn.wordpress.org/trunk@32241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 20:21:27 +00:00
Helen Hou-Sandí
685ebd0a6c Customizer theme details modal: Repair the layout for IE8.
props obenland.
fixes #32066.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32240 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 18:57:25 +00:00