<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[32647] trunk: Disallow post slugs that will result in permalinks that conflict with date archive URLs.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32647">32647</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32647","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-29 12:52:17 +0000 (Fri, 29 May 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Disallow post slugs that will result in permalinks that conflict with date archive URLs.
On certain permalink structures, a numeric post slug will result in a post
permalink that conflicts with a date archive URL. For example, with permastruct
`/%year%/%monthnum%/%postname%/`, a post published in May 2015 with slug
`'15'` will result in a URL (`/2015/05/15/`) that conflicts with the archive
for May 15, 2015.
To avoid this problem, `wp_unique_post_slug()` rejects a requested slug when it
would generate a conflict of this type. Thus, in our example, `'15'` would
become `'15-2'`.
Props valendesigns, boonebgorges, Denis-de-Bernardy, loushou.
See <a href="https://core.trac.wordpress.org/ticket/5305">#5305</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>
<li><a href="#trunktestsphpunittestspostwpUniquePostSlugphp">trunk/tests/phpunit/tests/post/wpUniquePostSlug.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2015-05-29 12:37:51 UTC (rev 32646)
+++ trunk/src/wp-includes/post.php 2015-05-29 12:52:17 UTC (rev 32647)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3790,6 +3790,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
</span><span class="cx" style="display: block; padding: 0 10px"> $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent post slugs that could result in URLs that conflict with date archives.
+ $conflicts_with_date_archive = false;
+ if ( 'post' === $post_type && preg_match( '/^[0-9]+$/', $slug ) && $slug_num = intval( $slug ) ) {
+ $permastructs = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
+ $postname_index = array_search( '%postname%', $permastructs );
+
+ /*
+ * Potential date clashes are as follows:
+ *
+ * - Any integer in the first permastruct position could be a year.
+ * - An integer between 1 and 12 that follows 'year' conflicts with 'monthnum'.
+ * - An integer between 1 and 31 that follows 'monthnum' conflicts with 'day'.
+ */
+ if ( 0 === $postname_index ||
+ ( $postname_index && '%year%' === $permastructs[ $postname_index - 1 ] && 13 > $slug_num ) ||
+ ( $postname_index && '%monthnum%' === $permastructs[ $postname_index - 1 ] && 32 > $slug_num )
+ ) {
+ $conflicts_with_date_archive = true;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter whether the post slug would be bad as a flat slug.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3799,7 +3820,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $slug The post slug.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $post_type Post type.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post_name_check || in_array( $slug, $feeds ) || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_name_check || in_array( $slug, $feeds ) || $conflicts_with_date_archive || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $suffix = 2;
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><span class="cx" style="display: block; padding: 0 10px"> $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php 2015-05-29 12:37:51 UTC (rev 32646)
+++ trunk/tests/phpunit/tests/admin/includesPost.php 2015-05-29 12:52:17 UTC (rev 32647)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,4 +313,168 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rewrite->set_permalink_structure( $old_permalink_structure );
</span><span class="cx" style="display: block; padding: 0 10px"> flush_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 5305
+ */
+ public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_year_archives() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_name' => '2015',
+ ) );
+
+ $found = get_sample_permalink( $p );
+ $this->assertEquals( '2015-2', $found[1] );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_get_sample_permalink_should_allow_yearlike_slugs_if_permastruct_does_not_cause_an_archive_conflict() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_name' => '2015',
+ ) );
+
+ $found = get_sample_permalink( $p );
+ $this->assertEquals( '2015', $found[1] );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_month_archives() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_name' => '11',
+ ) );
+
+ $found = get_sample_permalink( $p );
+ $this->assertEquals( '11-2', $found[1] );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_get_sample_permalink_should_ignore_potential_month_conflicts_for_invalid_monthnum() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_name' => '13',
+ ) );
+
+ $found = get_sample_permalink( $p );
+ $this->assertEquals( '13', $found[1] );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_day_archives() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_name' => '30',
+ ) );
+
+ $found = get_sample_permalink( $p );
+ $this->assertEquals( '30-2', $found[1] );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_get_sample_permalink_should_iterate_slug_suffix_when_a_date_conflict_is_found() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $this->factory->post->create( array(
+ 'post_name' => '30-2',
+ ) );
+
+ $p = $this->factory->post->create( array(
+ 'post_name' => '30',
+ ) );
+
+ $found = get_sample_permalink( $p );
+ $this->assertEquals( '30-3', $found[1] );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_get_sample_permalink_should_ignore_potential_day_conflicts_for_invalid_day() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_name' => '32',
+ ) );
+
+ $found = get_sample_permalink( $p );
+ $this->assertEquals( '32', $found[1] );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_get_sample_permalink_should_allow_daylike_slugs_if_permastruct_does_not_cause_an_archive_conflict() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%month%/%day%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_name' => '30',
+ ) );
+
+ $found = get_sample_permalink( $p );
+ $this->assertEquals( '30', $found[1] );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspostwpUniquePostSlugphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/wpUniquePostSlug.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2015-05-29 12:37:51 UTC (rev 32646)
+++ trunk/tests/phpunit/tests/post/wpUniquePostSlug.php 2015-05-29 12:52:17 UTC (rev 32647)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,4 +164,172 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 5305
+ */
+ public function test_slugs_resulting_in_permalinks_that_resemble_year_archives_should_be_suffixed() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_type' => 'post',
+ 'post_name' => 'foo',
+ ) );
+
+ $found = wp_unique_post_slug( '2015', $p, 'publish', 'post', 0 );
+ $this->assertEquals( '2015-2', $found );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_yearlike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_year_archives() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_type' => 'post',
+ 'post_name' => 'foo',
+ ) );
+
+ $found = wp_unique_post_slug( '2015', $p, 'publish', 'post', 0 );
+ $this->assertEquals( '2015', $found );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_slugs_resulting_in_permalinks_that_resemble_month_archives_should_be_suffixed() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_type' => 'post',
+ 'post_name' => 'foo',
+ ) );
+
+ $found = wp_unique_post_slug( '11', $p, 'publish', 'post', 0 );
+ $this->assertEquals( '11-2', $found );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_monthlike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_month_archives() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/foo/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_type' => 'post',
+ 'post_name' => 'foo',
+ ) );
+
+ $found = wp_unique_post_slug( '11', $p, 'publish', 'post', 0 );
+ $this->assertEquals( '11', $found );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_monthlike_slugs_should_not_be_suffixed_for_invalid_month_numbers() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_type' => 'post',
+ 'post_name' => 'foo',
+ ) );
+
+ $found = wp_unique_post_slug( '13', $p, 'publish', 'post', 0 );
+ $this->assertEquals( '13', $found );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_slugs_resulting_in_permalinks_that_resemble_day_archives_should_be_suffixed() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_type' => 'post',
+ 'post_name' => 'foo',
+ ) );
+
+ $found = wp_unique_post_slug( '30', $p, 'publish', 'post', 0 );
+ $this->assertEquals( '30-2', $found );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_daylike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_day_archives() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_type' => 'post',
+ 'post_name' => 'foo',
+ ) );
+
+ $found = wp_unique_post_slug( '30', $p, 'publish', 'post', 0 );
+ $this->assertEquals( '30', $found );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
+
+ /**
+ * @ticket 5305
+ */
+ public function test_daylike_slugs_should_not_be_suffixed_for_invalid_day_numbers() {
+ global $wp_rewrite;
+ $wp_rewrite->init();
+ $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
+ $wp_rewrite->flush_rules();
+
+ $p = $this->factory->post->create( array(
+ 'post_type' => 'post',
+ 'post_name' => 'foo',
+ ) );
+
+ $found = wp_unique_post_slug( '32', $p, 'publish', 'post', 0 );
+ $this->assertEquals( '32', $found );
+
+ $wp_rewrite->set_permalink_structure( '' );
+ flush_rewrite_rules();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>