Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-05 10:22:23 +01:00
Code Issues Projects Releases Wiki Activity
29,689 Commits 50 Branches 747 Tags 789 MiB
d8eb8da38a
Commit Graph

29689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dion Hulse
0f9cb9ce20 Updates: Better handling when the credential form is long (such as when SSH is active). This adds scrolling to the dialogue, and hides the SSH-specific fields when not using the SSH handler. 
Merges [32777] to the 4.2 branch, the JS changes were previously merged in [33304]
See #32435

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-07-18 05:25:28 +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
020f33ba74 Widgets: 
- Fix dragging to the bottom of the screen on the Widgets and Dashboard screens.
- Fix hiding of the dragged widget when dragging over a closed sidebar.
- Fix the admin menu position and scrolling when all widget containers are folded.
Fixes #32094 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@33313


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33285 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-07-17 21:06: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
Dion Hulse
c4faea356b Updates: When an update fails (and it's not during the credential form) allow further updates to continue, with the assumption that the error only affects a single plugin. 
Props magicroundabout.
Merges [32780] to the 4.2 branch
Fixes #32110 for 4.2


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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33278 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-07-17 04:09:27 +00:00
Dion Hulse
78b8290b7a Updates: Display the failure reason in addition to 'Update Failed', allows for debugging by site owners. 
Merges the behaviour of [32779] to the 4.2 branch without a string change.
See #32435, #32473

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33277 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-07-17 04:07:27 +00:00
Dion Hulse
c33661c857 Updates: Better handling when the credential form is long (such as when SSH is active). 
Merges the JS changes from [32777] to the 4.2 branch
See #32435

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33276 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-07-17 04:03:26 +00:00
Dion Hulse
3f40fe30a8 Updates: When a connection failure occurs, and no credential form is present client side, allow it to fall through to the normal failure handlers. 
Merges [32776] to the 4.2 branch
See #32435

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33275 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-07-17 04:01:27 +00:00
Dion Hulse
b6058e2231 Updates: Correctly identify more failed update cases. 
This checks for a WP_Error being raised during an individual update, in addition to just the bootstrap error cases.
When a error occurs during the connection phase, pass the error message back as the ajax failure message.

Merges [32571] & [32778] to the 4.2 branch

See #32473, #32435

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33274 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-07-17 03:59:28 +00:00
Dion Hulse
8e96288144 Shiny Updates: Handle the case where the plugin is installed into a different directory than it previously existed in. 
A good example of this is when the plugin being updated is currently installed as 'Plugin-Name' but the canonical directory is 'plugin-name', but it can also occur when the plugin is installed in 'super-cool-plugin' and it's canonical name is 'average-plugin'.

Merges [32570] to the 4.2 branch.
Fixes #32465

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-07-17 03:55:28 +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
7090cf8980 Updates: When performing an ajax plugin update, rely upon wp_update_plugins() to check the contents of the transient and return early if no request needs to be made. 
This works around a bug where custom update handlers are injecting an update into an empty transient, malforming the transient and causing update failures.
Merges [33257] to the 4.2 branch.
Fixes #32198 for 4.2

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33230 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-07-14 08:04:27 +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
Dion Hulse
61122743e2 Don't upgrade global tables to utf8mb4 when DO_NOT_UPGRADE_GLOBAL_TABLES is defined. 
This change also standardises on only checking `DO_NOT_UPGRADE_GLOBAL_TABLES` is defined, not it's value.

Fixes #32154 for 4.2

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33030 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-07-03 05:59:27 +00:00
Dion Hulse
371db8aea1 Remove a redundant index drop, it'll be dropped and re-created a few lines further down. 
Fixes a warning during updating from 4.0 or earlier.
Merges [32852] to the 4.2 branch. Fixes #31388 for 4.2

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32824 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-06-19 03:20:30 +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
Gary Pendergast
ca13bd76d5 Upgrades: If a table has already been converted to utf8mb4, there's no need to try and convert it again. 
Props gabrielperezs for the initial patch.

Merge of [32456] to the 4.2 branch.

Fixes #32310.


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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-05-08 12:28:28 +00:00
Andrew Nacin
1ee5e6c4dd Twenty Fifteen is 1.2 after [32392]. 
Built from https://develop.svn.wordpress.org/branches/4.2@32443


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-05-07 01:41:27 +00:00
Michael Adams
ba2de1e736 Upgrade: Since MySQL may auto-expand column widths when changing a column's character set, we must do our length-based comment checks prior to the character set changes. 
Props jorbin, et alii.

Merges [32440] for the 4.2 branch.

See #32165.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-05-07 01:12:29 +00:00
Michael Adams
ff4c5d2767 Upgrade: $wpdb->get_col_length() sanity check: bail on unexpected return value. 
See #32165.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-05-06 23:12:27 +00:00
Dominik Schilling
599782db47 Add closing paragraph tag for the 4.2.2 changelog entry. 
Built from https://develop.svn.wordpress.org/branches/4.2@32427


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

See #32165.

Props ocean90.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32388 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-05-06 21:50:29 +00:00
Dominik Schilling
e568d1e4b7 Bundled Themes: Remove Genericons example.html files. 
Merge [32392] to the 4.2 branch.
Built from https://develop.svn.wordpress.org/branches/4.2@32393


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-05-06 19:31:28 +00:00
Aaron Jorbin
ca97837cf3 When upgrading WordPress remove genericons example.html files 
[32385] for 4.2 branch

Props @dd32, @boone, @johnjamesjacoby, @drewapicture, @jorbin


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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32356 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-05-06 18:39:28 +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
Dion Hulse
4202e36193 When creating a temporary file treat the / directory properly, to prevent it ending up in an endless self-calling loop. 
Props hnle, taka2. Fixes #32135. See #31811
Merges [32322] to the 4.2 branch.

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


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32295 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-04-29 03:20:29 +00:00