Pass the post ID to the_title filter in post_formats_compat(). see #23347.

git-svn-id: http://core.svn.wordpress.org/trunk@23655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Prevent plugins with certain filenames from breaking links in the admin menu. props lightningspirit. fixes #22079.

git-svn-id: http://core.svn.wordpress.org/trunk@23656 1a063a9b-81f0-0310-95a4-ce76da25c4cd
ignore
Merge remote-tracking branch 'origin/master' into post-formats/23282
Merge remote-tracking branch 'upstream/master' into post-formats/23282