<!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>[13744] sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-page-limiter.php: Page Limiter: Update hook for setting max page & found posts so it applies to cached queries.</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="http://meta.trac.wordpress.org/changeset/13744">13744</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/13744","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ryelle</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-05-22 18:20:58 +0000 (Wed, 22 May 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'>Page Limiter: Update hook for setting max page & found posts so it applies to cached queries.
See https://github.com/WordPress/wordpress.org/pull/322</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubwporgpagelimiterphp">sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-page-limiter.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubwporgpagelimiterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-page-limiter.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-page-limiter.php 2024-05-22 15:47:37 UTC (rev 13743)
+++ sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-page-limiter.php 2024-05-22 18:20:58 UTC (rev 13744)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,8 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 404 on high pages instead of performing a DB query.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'parse_query', [ $this, 'parse_query' ], 100 );
</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 WP_Query::max_num_pages to self::MAX_PAGES
- add_filter( 'found_posts', [ $this, 'found_posts' ], 100, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'posts_results', [ $this, 'set_found_posts_max_pages' ], 100, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // BbPress Forum Topic pagination
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_topic_pagination', [ $this, 'bbp_topic_pagination' ], 100 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,9 +61,9 @@
</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"> // Make WordPress think there's only 50 pages
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function found_posts( $found_posts, $query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_found_posts_max_pages( $posts, $query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $query->is_main_query() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $found_posts;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $posts;
</ins><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"> // Set a 20 posts_per_page fallback just in case it's not set on the query.. Shouldn't actually be needed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,10 +70,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_per_page = $query->query_vars['posts_per_page'] ?? 20;
</span><span class="cx" style="display: block; padding: 0 10px"> $max_posts = self::MAX_PAGES * $posts_per_page;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return min(
- $found_posts,
- $max_posts
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query->original_found_posts = $query->found_posts;
+ $query->found_posts = min( $query->found_posts, $max_posts );
+
+ // Update the max-pages value too.
+ $query->max_num_pages = (int) ceil( $query->found_posts / $posts_per_page );
+
+ return $posts;
</ins><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"> // bbPress filter the max forum pagination
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,4 +88,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $args;
</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">-new WPORG_Page_Limiter();
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+new WPORG_Page_Limiter();
</ins></span></pre>
</div>
</div>
</body>
</html>