Canonical redirect not firing properly for ?p=# with custom post types

[nacin]

If the blog's permalinks are ugly, then ?p=# will not redirect to ?p=#&post_type=ptype (404). This is without regard to the rewrite setting on the post type.

If the blog's permalinks are pretty:

If rewrite => true on the post type, then ?p=# will redirect properly. However, `?p=#&post_type=ptype will cause post_type=ptype to be appended to the final pretty custom post type URL.

If rewrite => false on the post type, then ?p=# will not redirect (404). Also, p=#&post_type=ptype will redirect to p=#&post_type=ptype&post_type=ptype.

I imagine all of this is the same bug, in that post_type is being appended again. This results in either an internal rewrite and thus the 404, or the external redirect and then you get doubled post_type parameters.

[markjaquith]

(In [14954]) Properly redirect custom post type URLs in redirect_canonical(). fixes #13561