<!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>[59091] trunk: Canonical: Redirect when front page's paginated states not found.</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 { white-space: pre-line; 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/59091">59091</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/59091","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hellofromTonya</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-09-25 19:35:20 +0000 (Wed, 25 Sep 2024)</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'>Canonical: Redirect when front page's paginated states not found.
Perform a canonical redirect for an invalid pagination request of a static front page.
When a site has a static front page assigned and that page has a `<!--nextpage-->` within its content, previously accessing non-existing pages (e.g. `example.com/page/3/`) did not redirect or return a 404 or 301. This changeset resolves that issue by performing a canonical redirect.
Unit tests are also included for this specific use case and to ensure the fix does not affect a blog listing home page.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/47738">[47738]</a>, <a href="https://core.trac.wordpress.org/changeset/47727">[47727]</a>, <a href="https://core.trac.wordpress.org/changeset/34492">[34492]</a>.
Props dd32, audrasjb, chaion07, hellofromTonya, joemcgill, lukecarbis, Mte90, mukesh27, peterwilsoncc, rajinsharwar, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/50163">#50163</a>.
See meta<a href="https://core.trac.wordpress.org/ticket/5184">#5184</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpphp">trunk/src/wp-includes/class-wp.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalpagedphp">trunk/tests/phpunit/tests/canonical/paged.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpphp"></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/class-wp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp.php 2024-09-25 18:06:27 UTC (rev 59090)
+++ trunk/src/wp-includes/class-wp.php 2024-09-25 19:35:20 UTC (rev 59091)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,14 +747,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content_found = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = isset( $wp_query->post ) ? $wp_query->post : null;
- $next = '<!--nextpage-->';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = isset( $wp_query->post ) ? $wp_query->post : null;
+ $next = '<!--nextpage-->';
+ $page_qv = is_front_page() ? 'paged' : 'page';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for paged content that exceeds the max number of pages.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post && ! empty( $this->query_vars['page'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post && ! empty( $this->query_vars[ $page_qv ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check if content is actually intended to be paged.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( str_contains( $post->post_content, $next ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page = trim( $this->query_vars['page'], '/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page = trim( $this->query_vars[ $page_qv ], '/' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_found = (int) $page <= ( substr_count( $post->post_content, $next ) + 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $content_found = false;
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalpagedphp"></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/canonical/paged.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/paged.php 2024-09-25 18:06:27 UTC (rev 59090)
+++ trunk/tests/phpunit/tests/canonical/paged.php 2024-09-25 19:35:20 UTC (rev 59091)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,4 +26,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Non-existing page should redirect to the permalink.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCanonical( $link . '4/', $link );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Ensures canonical redirects are performed for sites with a static front page.
+ *
+ * @ticket 50163
+ */
+ public function test_redirect_missing_front_page_pagination_canonical() {
+ update_option( 'show_on_front', 'page' );
+
+ $page_id = self::factory()->post->create(
+ array(
+ 'post_title' => 'front-page-1',
+ 'post_type' => 'page',
+ 'post_content' => "Front Page 1\n<!--nextpage-->\nPage 2",
+ )
+ );
+
+ update_option( 'page_on_front', $page_id );
+
+ $link = parse_url( get_permalink( $page_id ), PHP_URL_PATH );
+
+ // Valid page numbers should not redirect.
+ $this->assertCanonical( $link, $link, 'The home page is not expected to redirect.' );
+ $this->assertCanonical( $link . 'page/2/', $link . 'page/2/', 'Page 2 exists and is not expected to redirect.' );
+
+ // Invalid page numbers should redirect to the front page.
+ $this->assertCanonical( $link . 'page/3/', $link, 'Page 3 does not exist and is expected to redirect to the home page.' );
+ }
+
+ /**
+ * Ensures that canonical redirects are not performed for sites with a blog listing home page.
+ *
+ * @ticket 50163
+ */
+ public function test_redirect_missing_front_page_pagination_does_not_affect_posts_canonical() {
+ self::factory()->post->create_many( 3 );
+ update_option( 'posts_per_page', 2 );
+
+ // Valid page numbers should not redirect.
+ $this->assertCanonical( '/', '/', 'Page one of the blog archive should not redirect.' );
+ $this->assertCanonical( '/page/2/', '/page/2/', 'Page 2 of the blog archive exists and is not expected to redirect.' );
+
+ // Neither should invalid page numbers.
+ $this->assertCanonical( '/page/3/', '/page/3/', 'Page 3 of the blog archive is not populated but is not expected to redirect.' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>