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
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
Andrew Nacin
865b9a613e
Branch 4.2.
...
Built from https://develop.svn.wordpress.org/@32278
git-svn-id: http://core.svn.wordpress.org/branches/4.2@32249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-23 16:18:07 +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
Helen Hou-Sandí
6fbfc06e0d
Admin menu: prevent (most) lock outs caused by plugins or IE7.
...
fixes #30900 .
Built from https://develop.svn.wordpress.org/trunk@32268
git-svn-id: http://core.svn.wordpress.org/trunk@32239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 18:38:29 +00:00
Dominik Schilling
aea00880f1
Don't try to focus disabled input fields in the request filesystem credentials form.
...
fixes #32064 .
Built from https://develop.svn.wordpress.org/trunk@32267
git-svn-id: http://core.svn.wordpress.org/trunk@32238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 16:57:26 +00:00
Dominik Schilling
89e45feb4c
Don't focus input fields outside of the request filesystem credentials form.
...
props valendesigns.
fixes #32055 .
Built from https://develop.svn.wordpress.org/trunk@32266
git-svn-id: http://core.svn.wordpress.org/trunk@32237 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 16:24:26 +00:00
Dominik Schilling
b29c8c503b
Theme Switcher: Provide an easier way to reset back to the current active theme.
...
* Add control for the active theme when doing a theme preview
* Highlight an active theme and move it to the top
props valendesigns, ocean90.
fixes #32002 .
Built from https://develop.svn.wordpress.org/trunk@32265
git-svn-id: http://core.svn.wordpress.org/trunk@32236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 16:15:27 +00:00
Dominik Schilling
e0657e6904
Don't return empty themes in wp_prepare_themes_for_js()
.
...
see #32002 .
Built from https://develop.svn.wordpress.org/trunk@32264
git-svn-id: http://core.svn.wordpress.org/trunk@32235 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 16:11:25 +00:00
Gary Pendergast
16bdf0ab2c
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.
...
See #32051 .
Built from https://develop.svn.wordpress.org/trunk@32261
git-svn-id: http://core.svn.wordpress.org/trunk@32232 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 15:02:28 +00:00
Sergey Biryukov
3e99df2858
About page design for 4.2.
...
props melchoyce, ryelle.
see #31929 .
Built from https://develop.svn.wordpress.org/trunk@32260
git-svn-id: http://core.svn.wordpress.org/trunk@32231 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-22 06:04:29 +00:00
Helen Hou-Sandí
3fdd3ba9b5
Don't add a class for comment authors who are members of the current site.
...
Reverts [32245] and [31518]. We'll keep the whitespace and comment clarification, though.
see #24054 .
Built from https://develop.svn.wordpress.org/trunk@32259
git-svn-id: http://core.svn.wordpress.org/trunk@32230 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 23:36:25 +00:00
Andrew Ozz
60706015e1
Revert editing of video embed parameters in the media modal, [31620] and [31626] for now. Plan on revisiting in 4.3.
...
Props iseulde. Fixes #31139 , fixes #32006 .
Built from https://develop.svn.wordpress.org/trunk@32258
git-svn-id: http://core.svn.wordpress.org/trunk@32229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 22:41:26 +00:00
Andrew Ozz
bafd7b98f6
TinyMCE wpView: properly deselect views when hiding the editor. Do not remove selected
on PreProcess.
...
Fixes #32045 .
Built from https://develop.svn.wordpress.org/trunk@32257
git-svn-id: http://core.svn.wordpress.org/trunk@32228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 21:32:26 +00:00
Helen Hou-Sandí
e8ee561a4f
Shiny Updates: Prevent the post-update success message from jumping.
...
props pareshradadiya, afercia.
fixes #31984 .
Built from https://develop.svn.wordpress.org/trunk@32256
git-svn-id: http://core.svn.wordpress.org/trunk@32227 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 20:41:28 +00:00
Andrew Ozz
f003efc8aa
TinyMCE wpView: ensure contentNode
is passed to all callbacks.
...
Props iseulde. Fixes #31669 .
Built from https://develop.svn.wordpress.org/trunk@32255
git-svn-id: http://core.svn.wordpress.org/trunk@32226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 18:36:24 +00:00
Gary Pendergast
e2f084d4bd
Bump version number for nightly builds.
...
Built from https://develop.svn.wordpress.org/trunk@32249
git-svn-id: http://core.svn.wordpress.org/trunk@32220 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 15:25:24 +00:00
Gary Pendergast
79a7c25b49
Trunk is now 4.2-RC3.
...
Built from https://develop.svn.wordpress.org/trunk@32248
git-svn-id: http://core.svn.wordpress.org/trunk@32219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 14:43:26 +00:00