Changeset 13236

Timestamp:

02/18/2022 11:06:15 PM (3 years ago)

Author:

r-a-y

Message:

Blogs: Fix pagination in BP_Blogs_Blog::get().

As part of #8488, we refactored BP_Blogs_Blog::get() to use an array
as the main function argument instead of passing multiple function
arguments.

In BP_Blogs_Blog::get(), the "per page" argument was previously
$limit, while in bp_blogs_get_blogs(), the "per page" argument
passed to BP_Blogs_Blog::get() is $r['per_page']. When swapping
over to the array function argument, $r['limit'] does not exist,
which broke pagination and would return all blogs instead.

This commit fixes the pagination problem by renaming the array key
from $r['limit'] to $r['per_page'].

Props imath.

Fixes #8633 (trunk)

Location:

trunk/src/bp-blogs

Files:

• bp-blogs-functions.php (modified) (1 diff)
• classes/class-bp-blogs-blog.php (modified) (4 diffs)

trunk/src/bp-blogs/bp-blogs-functions.php

@@ -1254 +1254 @@
  * @see BP_Blogs_Blog::get() for a description of parameters and return values.
  *
- * @param int|null $limit See {@BP_Blogs_Blog::get()}.
+ * @param int|null $per_page See {@BP_Blogs_Blog::get()}.
  * @param int|null $page  See {@BP_Blogs_Blog::get()}.
  * @return array See {@BP_Blogs_Blog::get()}.
  */
-function bp_blogs_get_random_blogs( $limit = null, $page = null ) {
+function bp_blogs_get_random_blogs( $per_page = null, $page = null ) {
     return BP_Blogs_Blog::get(
         array(
-            'type'  => 'random',
-            'limit' => $limit,
-            'page'  => $page
+            'type'     => 'random',
+            'per_page' => $per_page,
+            'page'     => $page
         )
     );

trunk/src/bp-blogs/classes/class-bp-blogs-blog.php

@@ -171 +171 @@
      *     @type string      $type              The order in which results should be returned.
      *                                          'active', 'alphabetical', 'newest', or 'random'.
-     *     @type int|bool    $limit             Optional. The maximum records to return.
+     *     @type int|bool    $per_page          Optional. The number of records to return per page.
      *                                          Default: false.
      *     @type int|bool    $page              Optional. The page of records to return.
@@ -201 +201 @@
             $old_args_keys = [
                 0  => 'type',
-                1  => 'limit',
+                1  => 'per_page',
                 2  => 'page',
                 3  => 'user_id',
@@ -218 +218 @@
             array(
                 'type'              => 'active',
-                'limit'             => false,
+                'per_page'          => false,
                 'page'              => false,
                 'user_id'           => 0,
@@ -234 +234 @@
         }
 
-        $pag_sql = ( $r['limit'] && $r['page'] ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $r['page'] - 1 ) * $r['limit']), intval( $r['limit'] ) ) : '';
+        $pag_sql = ( $r['per_page'] && $r['page'] ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $r['page'] - 1 ) * $r['per_page']), intval( $r['per_page'] ) ) : '';
 
         $user_sql = ! empty( $r['user_id'] ) ? $wpdb->prepare( " AND b.user_id = %d", $r['user_id'] ) : '';