Changeset 9570 for trunk/src/bp-notifications/bp-notifications-template.php

Timestamp:

03/01/2015 01:34:15 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Notifications: Ensure pagination works with $_GET parameters.

Props boonebgorges. See #6229. (trunk)

File:

• trunk/src/bp-notifications/bp-notifications-template.php (modified) (5 diffs)

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

@@ -206 +206 @@
 
     /**
+     * The $_GET argument used in URLs for determining pagination
+     *
+     * @since BuddyPress (1.9.0)
+     * @access public
+     * @var int
+     */
+    public $pag_arg;
+
+    /**
      * The number of items to display per page of results.
      *
@@ -249 +258 @@
      */
     public $sort_order;
+
+    /**
+     * Array of variables used in this notification query
+     *
+     * @since BuddyPress (2.2.2)
+     * @var array
+     */
+    public $query_vars;
 
     /**
@@ -268 +285 @@
             'id'                => false,
             'user_id'           => 0,
+            'item_id'           => false,
             'secondary_item_id' => false,
             'component_name'    => bp_notifications_get_registered_components(),
@@ -275 +293 @@
             'order_by'          => 'date_notified',
             'sort_order'        => 'DESC',
+            'page_arg'          => 'npage',
             'page'              => 1,
             'per_page'          => 25,
             'max'               => null,
-            'page_arg'          => 'npage',
         ) );
 
@@ -300 +318 @@
         $this->order_by     = $r['order_by'];
         $this->sort_order   = $r['sort_order'];
+        $this->query_vars   = array(
+            'id'                => $r['id'],
+            'user_id'           => $this->user_id,
+            'item_id'           => $r['item_id'],
+            'secondary_item_id' => $r['secondary_item_id'],
+            'component_name'    => $r['component_name'],
+            'component_action'  => $r['component_action'],
+            'is_new'            => $this->is_new,
+            'search_terms'      => $this->search_terms,
+            'order_by'          => $this->order_by,
+            'sort_order'        => $this->sort_order,
+            'page'              => $this->pag_page,
+            'per_page'          => $this->pag_num,
+        );
 
         // Setup the notifications to loop through
-        $this->notifications            = BP_Notifications_Notification::get( $r );
-        $this->total_notification_count = BP_Notifications_Notification::get_total_count( $r );
+        $this->notifications            = BP_Notifications_Notification::get( $this->query_vars );
+        $this->total_notification_count = BP_Notifications_Notification::get_total_count( $this->query_vars );
 
         if ( empty( $this->notifications ) ) {