Changeset 9169

Timestamp:

11/23/2014 01:47:32 AM (10 years ago)

Author:

boonebgorges

Message:

Ensure that 'count_total' is available throughout bp_has_activities() loop.

Props tharsheblows.
Fixes #5915.

File:

• trunk/src/bp-activity/bp-activity-template.php (modified) (6 diffs)

trunk/src/bp-activity/bp-activity-template.php

@@ -196 +196 @@
             'page_arg'          => 'acpage',
             'max'               => false,
+            'count_total'       => false,
             'sort'              => false,
             'include'           => false,
@@ -227 +228 @@
                 'activity_ids'      => explode( ',', $include ),
                 'max'               => $max,
+                'count_total'       => $count_total,
                 'page'              => $this->pag_page,
                 'per_page'          => $this->pag_num,
@@ -241 +243 @@
                 'display_comments'  => $display_comments,
                 'max'               => $max,
+                'count_total'       => $count_total,
                 'per_page'          => $this->pag_num,
                 'page'              => $this->pag_page,
@@ -448 +451 @@
  *     @type int|bool $max Maximum number of results to return.
  *           Default: false (unlimited).
+ *     @type string|bool $count_total If true, an additional DB query is run to
+ *           count the total activity items for the query. Default: false.
  *     @type string $sort 'ASC' or 'DESC'. Default: 'DESC'.
  *     @type array|bool $exclude Array of activity IDs to exclude. Default: false.
@@ -587 +592 @@
         'per_page'          => 20,           // number of items per page
         'max'               => false,        // max number to return
+        'count_total'       => false,
         'show_hidden'       => $show_hidden, // Show activity items that are hidden site-wide?
         'spam'              => 'ham_only',   // Hide spammed items
@@ -720 +726 @@
         'page_arg'          => $page_arg,
         'max'               => $max,
+        'count_total'       => $count_total,
         'sort'              => $sort,
         'include'           => $include,