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
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
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
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
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
Revert [28948] for the 4.0 branch, which caused a regression.

see #29573 for 4.0. see #28350.

Built from https://develop.svn.wordpress.org/branches/4.0@30410


git-svn-id: http://core.svn.wordpress.org/branches/4.0@30405 1a063a9b-81f0-0310-95a4-ce76da25c4cd