8254664893
The 4.0 branch is now 4.0.3.
...
Built from https://develop.svn.wordpress.org/branches/4.0@32283
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-23 21:35:37 +00:00
488576e125
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.0 branch.
See #32051 .
Built from https://develop.svn.wordpress.org/branches/4.0@32272
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32243 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-23 11:44:39 +00:00
e20485b9cb
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.0 branch.
...
See #32029 .
Built from https://develop.svn.wordpress.org/branches/4.0@32235
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 06:19:40 +00:00
530a462ba1
Fix some `wpdb::check_safe_collation()` calls missed in [32181].
...
Built from https://develop.svn.wordpress.org/branches/4.0@32225
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 19:06:42 +00:00
d4d995bb8e
Bump 4.0 branch to 4.0.2.
...
Built from https://develop.svn.wordpress.org/branches/4.0@32219
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 17:40:10 +00:00
2af7429643
In Multisite, prevent plugins from unintentionally switching sites. Merge of [32173] to the 4.0 branch.
...
Props mdawaffe, pento.
Built from https://develop.svn.wordpress.org/branches/4.0@32199
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 13:20:36 +00:00
c5dbb01a4c
Update the Plupload Flash file to the latest version. Merge of [32168] to the 4.0 branch.
...
Props azaozz.
Built from https://develop.svn.wordpress.org/branches/4.0@32197
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32170 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 13:04:35 +00:00
766a6f6fa1
Remove some old backwards compatibility code from TinyMCE. Merge of [32166] to the 4.0 branch.
...
Props azaozz.
Built from https://develop.svn.wordpress.org/branches/4.0@32193
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32166 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 12:49:33 +00:00
3170d00fa6
Clean up some edge cases in `sanitize_sql_orderby()`. Merge of [32164] to the 4.0 branch.
...
Props vortfu, dd32.
Built from https://develop.svn.wordpress.org/branches/4.0@32189
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32162 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 12:32:39 +00:00
55be6d3e44
`wpdb::$checking_collation` was incorrectly marked as `protected` instead of `private` in [32181].
...
Built from https://develop.svn.wordpress.org/branches/4.0@32184
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 11:21:35 +00:00
548201e950
Merge the query sanity checks from #21212 to the 4.0 branch.
...
Props pento, nacin, mdawaffe, DrewAPicture.
Built from https://develop.svn.wordpress.org/branches/4.0@32181
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 10:54:40 +00:00
285af6e86c
The 4.0 branch is now 4.0.2-alpha.
...
Built from https://develop.svn.wordpress.org/branches/4.0@32153
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 03:34:41 +00:00
be559a4584
Backport the PHPUnit test fixes from [31622] to the 4.0 branch.
...
Props boonebgorges.
See #31537 .
Built from https://develop.svn.wordpress.org/branches/4.0@32148
git-svn-id: http://core.svn.wordpress.org/branches/4.0@32126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-19 07:43:42 +00:00
e34cfb7c73
Undo changes to the 4.0 branch caused by clean-css 2.2.8 (branch) versus 2.2.16 (trunk).
...
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30472 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 17:41:01 +00:00
d9f6f1c2ea
4.0.1 version bumps.
...
Built from https://develop.svn.wordpress.org/branches/4.0@30475
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30466 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 16:32:32 +00:00
39c7ff2304
Prevent high resource usage when hashing large passwords. props mdawaffe, pento
...
Merges [30466] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@30467
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 16:05:39 +00:00
d9cd72430f
Anchor texturize to shortcodes to improve regex efficiency.
...
For the 4.0 branch; see [30449] for trunk.
props miqrogroove.
see #29557 for segfault issues.
Built from https://develop.svn.wordpress.org/branches/4.0@30450
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30444 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 14:30:37 +00:00
be45cc1d6a
Better validation of the URL used in core HTTP requests.
...
Merges [30443] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@30444
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 14:01:52 +00:00
50a4318776
TinyMCE: Verify HTML in captions. props azaozz
...
Merges [30435] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@30436
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30431 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 13:50:41 +00:00
65ac1b9a84
Invalidate password keys when a user's email changes.
...
Merges [30430] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@30431
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 13:40:53 +00:00
5fcfb73bf6
Fix typo in style filter. props miqrogroove
...
Merges [30425] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@30426
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30421 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 13:16:29 +00:00
dd9f42a1f6
Playlists are video by default. props duck_
...
Merges [30422] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@30423
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30418 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 13:12:31 +00:00
432912f7e9
Use hash_equals() for old md5 hashes.
...
Merges [30412] to the 4.0 branch.
Built from https://develop.svn.wordpress.org/branches/4.0@30413
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30408 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 12:02:35 +00:00
3a108f5bce
Media Grid: Don't attempt to delete an attachment that can't be deleted.
...
Merges [29755] to the 4.0 branch.
props wonderboymusic.
fixes #29597 .
Built from https://develop.svn.wordpress.org/branches/4.0@30409
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 11:09:32 +00:00
e2cf18d5b9
Don't display Edit links for attachments user cannot edit.
...
Merges [29723] to the 4.0 branch.
props skaeser.
fixes #29596 .
Built from https://develop.svn.wordpress.org/branches/4.0@30408
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 11:07:36 +00:00
94f0e4dfb6
Media Grid: when the modal is open, don't respond to arrow keys when `<textarea>` has focus.
...
Merges [29777] (and [30378]) to the 4.0 branch.
Props ryelle, adamsilverstein.
Fixes #29725 .
Built from https://develop.svn.wordpress.org/branches/4.0@30407
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 11:06:29 +00:00
3f256ab656
TinyMCE: fix image captions regexp when wpautop is disabled in wp_editor().
...
Merges [29730] to the 4.0 branch.
props azaozz.
fixes #29592 .
Built from https://develop.svn.wordpress.org/branches/4.0@30406
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 11:00:51 +00:00
0e76113043
In get_adjacent_post(), $excluded_terms should check term_id rather than term_taxonomy_id.
...
Merges [30263] (and [30264] [30401]) to the 4.0 branch.
props boonebgorges.
fixes #29663 , see #22112 .
Built from https://develop.svn.wordpress.org/branches/4.0@30405
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 10:59:35 +00:00
59ae9aa3a7
Media Frames: Set the box-sizing CSS property to border-box for checkboxes and radio buttons.
...
Merges [29727] to the 4.0 branch.
props mlteal.
fixes #29493 .
Built from https://develop.svn.wordpress.org/branches/4.0@30262
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 13:24:42 +00:00
4f14d9f7f8
In `wp_audio|video_shortcode()`, make sure that `autoplay` and `loop` are booleans. Passing `'false'` to them will force them to be active, which is bad.
...
Merges [30185] to the 4.0 branch.
props wonderboymusic.
fixes #29825 .
Built from https://develop.svn.wordpress.org/branches/4.0@30261
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30261 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 08:23:29 +00:00
eec6b41e3d
Create correct permalinks for child posts of hierarchical post types when default permalinks are used.
...
Merges [29765] to the 4.0 branch.
props loushou.
fixes #29615 .
Built from https://develop.svn.wordpress.org/branches/4.0@30260
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30260 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 08:22:35 +00:00
7be0716c9f
Avoid PHP notices in media modal caused by orphaned attachments.
...
Merges [29724] to the 4.0 branch.
props SergeyBiryukov.
fixes #29566 .
Built from https://develop.svn.wordpress.org/branches/4.0@30259
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30259 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 08:16:33 +00:00
8930d00db0
Make sure the $parent argument of wp_insert_attachment() still works as expected after [28579].
...
Merges [29745] to the 4.0 branch.
props jesin, dikiy_forester.
fixes #29646 .
Built from https://develop.svn.wordpress.org/branches/4.0@30258
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 08:15:30 +00:00
5add2ed4b1
TinyMCE wpView: when pasting/inserting content before a view, add new paragraph above it and insert the content there.
...
Merges [29766] to the 4.0 branch.
props avryl.
fixes #29380 .
Built from https://develop.svn.wordpress.org/branches/4.0@30257
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30257 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 08:13:29 +00:00
b94cfff6ad
Create new $wp_roles object in install_blog() to avoid protected _init() call
...
Merges [30242] to the 4.0 branch.
Our call to `$wp_roles->_init()` relied on the `__call()` method in `WP_Roles` to handle the link to the protected method. This works back to PHP 5.2.9, when a bug was fixed allowing access to protected methods through this exact approach.
`install_blog()` needs a fresh `$wp_roles` object after `populate_roles()` resets everything in its path. We can create this new object from scratch, effectively doing the same thing with the call to `_init()` via the constructor.
props jeremyfelt.
fixes #29692 .
Built from https://develop.svn.wordpress.org/branches/4.0@30255
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30255 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 08:09:05 +00:00
2db717b03b
Revert [28610] in order to avoid infinite redirect loops on reverse proxies which proxy from HTTPS to HTTP.
...
Merges [30090] to the 4.0 branch.
fixes #28610 .
Built from https://develop.svn.wordpress.org/branches/4.0@30253
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30253 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 07:16:39 +00:00
f904bbceb5
Upgrade MediaElement to 2.15.1.
...
Merges [29733] to the 4.0 branch.
Changes from 2.15.0:
https://github.com/johndyer/mediaelement/compare/2.15.0...2.15.1
Continues to revert upstream commit b7f82b4 to restore the status quo for Chromium support.
props wonderboymusic.
fixes #29620 .
Built from https://develop.svn.wordpress.org/branches/4.0@30252
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30252 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 07:11:31 +00:00
e2c870f41b
Quicktags: move focusing the editor after inserting content to the end of the code blocks.
...
Merges [29884] to the 4.0 branch.
Fixes a bug in Chrome where both the textarea and the window may auto-scroll to unexpected position on clicking a Quicktags button.
props azaozz, avryl.
fixes #29944 .
Built from https://develop.svn.wordpress.org/branches/4.0@30250
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 07:03:32 +00:00
bab3933829
The 4.0 branch is 4.0.1-alpha.
...
Built from https://develop.svn.wordpress.org/branches/4.0@30248
git-svn-id: http://core.svn.wordpress.org/branches/4.0@30248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-06 06:49:37 +00:00
4edbc74e65
Add safeguards for when ext/hash is not compiled with PHP.
...
Merges [29751] to the 4.0 branch.
fixes #29518 .
Built from https://develop.svn.wordpress.org/branches/4.0@29761
git-svn-id: http://core.svn.wordpress.org/branches/4.0@29533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-23 18:14:39 +00:00
250c2ce999
WordPress 4.0.
...
Built from https://develop.svn.wordpress.org/trunk@29709
git-svn-id: http://core.svn.wordpress.org/trunk@29483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-04 15:32:15 +00:00
f7392ef917
Pinking shears.
...
Built from https://develop.svn.wordpress.org/trunk@29707
git-svn-id: http://core.svn.wordpress.org/trunk@29481 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-04 15:23:16 +00:00
0b3ba1e405
Media grid details: Load large images instead of originals, if available.
...
fixes #29498 .
Built from https://develop.svn.wordpress.org/trunk@29704
git-svn-id: http://core.svn.wordpress.org/trunk@29478 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-04 14:38:16 +00:00
00fac0639d
Link to apps.wordpress.org instead of wordpress.org/mobile.
...
props pento.
fixes #29496 .
Built from https://develop.svn.wordpress.org/trunk@29703
git-svn-id: http://core.svn.wordpress.org/trunk@29477 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-04 14:22:15 +00:00
69be1c682f
4.0-RC3.
...
Built from https://develop.svn.wordpress.org/trunk@29699
git-svn-id: http://core.svn.wordpress.org/trunk@29474 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-03 18:07:17 +00:00
5a786077c5
4.0-RC2.
...
Built from https://develop.svn.wordpress.org/trunk@29696
git-svn-id: http://core.svn.wordpress.org/trunk@29471 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-03 11:37:15 +00:00
2ff943b7b0
Restore the post type's view_item label for preview links that don't submit the changes.
...
fixes #28350 .
Built from https://develop.svn.wordpress.org/trunk@29695
git-svn-id: http://core.svn.wordpress.org/trunk@29470 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-03 11:33:16 +00:00
9db108dbe0
Allow language specified by the WPLANG constant (but not installed) to be chosen.
...
fixes #29456 .
Built from https://develop.svn.wordpress.org/trunk@29691
git-svn-id: http://core.svn.wordpress.org/trunk@29466 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-03 08:03:16 +00:00
cb242bb358
MediaElement: Bump version. see #29110 .
...
Built from https://develop.svn.wordpress.org/trunk@29689
git-svn-id: http://core.svn.wordpress.org/trunk@29464 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-03 06:33:16 +00:00
4d6697aaa6
MediaElement: Revert upstream commit b7f82b4 to restore the status quo for Chromium support.
...
fixes #29110 .
Built from https://develop.svn.wordpress.org/trunk@29688
git-svn-id: http://core.svn.wordpress.org/trunk@29463 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-03 06:32:15 +00:00
Helen Hou-Sandí
Gary Pendergast
Andrew Nacin
Sergey Biryukov