<!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>[51125] trunk: Permalinks: Revert the changes stemming from pagination limits.</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/51125">51125</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/51125","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-06-08 23:31:46 +0000 (Tue, 08 Jun 2021)</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'>Permalinks: Revert the changes stemming from pagination limits.

In <a href="https://core.trac.wordpress.org/changeset/51118">[51118]</a>, an attempt was made to add pagination limits. The added tests need to be updated to ensure that they pass with the new changes.

Reverts <a href="https://core.trac.wordpress.org/changeset/51118">[51118]</a>.

See <a href="https://core.trac.wordpress.org/ticket/50233">#50233</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunktestsphpunittestslinkwpGetCanonicalUrlphp">trunk/tests/phpunit/tests/link/wpGetCanonicalUrl.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescanonicalphp"></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/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php       2021-06-08 23:23:12 UTC (rev 51124)
+++ trunk/src/wp-includes/canonical.php 2021-06-08 23:31:46 UTC (rev 51125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * or query in an attempt to figure the correct page to go to.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 2.3.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.8.0 Checks comment page count to limit pagination.
</del><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
</span><span class="cx" style="display: block; padding: 0 10px">  * @global bool       $is_IIS
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,16 +504,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                && ( 'newest' === $default_comments_page && $cpage > 0
</span><span class="cx" style="display: block; padding: 0 10px">                                        || 'newest' !== $default_comments_page && $cpage > 1 )
</span><span class="cx" style="display: block; padding: 0 10px">                        ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Checks comment page count to limit pagination.
-                               $per_page = get_option( 'comments_per_page' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $addl_path  = ( ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '' );
+                               $addl_path .= user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . $cpage, 'commentpaged' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Get the total number of pages for comments.
-                               $comments_total_pages = ceil( ( $wp_query->post->comment_count ) / $per_page );
-                               if ( $cpage <= $comments_total_pages ) {
-                                       $addl_path  = ( ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '' );
-                                       $addl_path .= user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . $cpage, 'commentpaged' );
-                               }
-
</del><span class="cx" style="display: block; padding: 0 10px">                                 $redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunktestsphpunittestslinkwpGetCanonicalUrlphp"></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/link/wpGetCanonicalUrl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/wpGetCanonicalUrl.php      2021-06-08 23:23:12 UTC (rev 51124)
+++ trunk/tests/phpunit/tests/link/wpGetCanonicalUrl.php        2021-06-08 23:31:46 UTC (rev 51125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,27 +152,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Limit pagination for comments.
-        *
-        *  @ticket 50233
-        */
-       public function test_comments_limit_paged_with_plain_permalink_structure() {
-               $cpage = 5;
-
-               $link = add_query_arg(
-                       array(
-                               'cpage' => $cpage,
-                               'foo'   => 'bar',
-                       ),
-                       get_permalink( self::$post_id )
-               );
-
-               $this->go_to( $link );
-               $expected = get_permalink( self::$post_id ) . '#comments';
-               $this->assertSame( $expected, wp_get_canonical_url( self::$post_id ) );
-       }
-
-       /**
</del><span class="cx" style="display: block; padding: 0 10px">          * Filter callback for testing of filter usage.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @return string
</span></span></pre>
</div>
</div>

</body>
</html>