wp_unique_post_slug() doesn't check pagination base when CPT has archive

[scribu]

Title says it all.

[scribu]

16843.diff​ has the added bonus that it avoids an unnecessary query, if any of the preceding conditions match.

[hakre]

For better readability of the code, please add logical operators (mostly || in your patch) to the front of the line so it's easier to read how lines are in relation to each other.

[scribu]

formatting

[scribu]

That does look better.

[nacin]

What's the actual code change here? Just the final block of code, checking the pagination base?

[scribu]

You did mean 3.2, right?

The added line is indeed in the final block:

|| ( $post_type_obj->has_archive && $wp_rewrite->pagination_base == $slug )

[scribu]

You probably meant to set the version, but I'll leave the milestone also.

[ryan]

Punting per bug scrub.

[wonderboymusic]

Patch refreshed so it applies cleanly against trunk

[nacin]

Some proper unit tests would be great here.

I'm seeing preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug ) for hierarchical post types, is that not necessary here?

[nacin]

Punting as this is minor.

[wonderboymusic]

16843.4.diff​​ is fuzz-less​

[nacin]

Still needs tests, I think.