Changeset 12967

Timestamp:

11/14/2023 11:12:02 PM (10 months ago)

Author:

coffee2code

Message:

Photo Directory, Posts: Take into account logged-out pagination limit on w.org.

Since the front page limit differs from the archive limits, the Photo Directory does its own max page calculation, which is not compatible with the WPORG_Page_Limiter's own generic calculation.

Fixes #6214.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/posts.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/photo-directory/inc/posts.php

@@ -315 +315 @@
      */
     public static function fix_front_page_pagination_count( $posts, $query ) {
-        if ( $query->is_home() ) {
+        if ( $query->is_home() && $query->is_main_query() ) {
             $front_page_count  = get_option( 'posts_per_page' );
             $archives_per_page = 30;
@@ -323 +323 @@
             if ( $total_posts > 0 ) {
                 $count += ceil( $total_posts / $archives_per_page );
+            }
+            // Account for logged-out pagination limit on w.org.
+            if ( defined( '\WPORG_Page_Limiter::MAX_PAGES' ) && ! is_user_logged_in() ) {
+                $count = min( $count, \WPORG_Page_Limiter::MAX_PAGES );
             }
             $query->max_num_pages = $count;