<!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>[BuddyPress][9571] branches/2.2: Notifications: Ensure pagination works with $_GET parameters.</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 { 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://buddypress.trac.wordpress.org/changeset/9571">9571</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9571","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-01 13:36:46 +0000 (Sun, 01 Mar 2015)</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'>Notifications: Ensure pagination works with $_GET parameters.
Props boonebgorges. See <a href="http://buddypress.trac.wordpress.org/ticket/6229">#6229</a>. (2.2 branch)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches22srcbpnotificationsbpnotificationstemplatephp">branches/2.2/src/bp-notifications/bp-notifications-template.php</a></li>
<li><a href="#branches22testsphpunittestcasesnotificationsclassbpnotificationsnotificationphp">branches/2.2/tests/phpunit/testcases/notifications/class-bp-notifications-notification.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches22testsphpunittestcasesnotificationsclassbpnotificationstemplatephp">branches/2.2/tests/phpunit/testcases/notifications/class-bp-notifications-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches22srcbpnotificationsbpnotificationstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.2/src/bp-notifications/bp-notifications-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.2/src/bp-notifications/bp-notifications-template.php 2015-03-01 13:34:15 UTC (rev 9570)
+++ branches/2.2/src/bp-notifications/bp-notifications-template.php 2015-03-01 13:36:46 UTC (rev 9571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,6 +205,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $pag_page;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The $_GET argument used in URLs for determining pagination
+ *
+ * @since BuddyPress (1.9.0)
+ * @access public
+ * @var int
+ */
+ public $pag_arg;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * The number of items to display per page of results.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.9.0)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,6 +259,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $sort_order;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Array of variables used in this notification query
+ *
+ * @since BuddyPress (2.2.2)
+ * @var array
+ */
+ public $query_vars;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Constructor method.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see bp_has_notifications() For information on the array format.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,6 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => 0,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'item_id' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'secondary_item_id' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'component_name' => bp_notifications_get_registered_components(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'component_action' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,10 +292,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'search_terms' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order_by' => 'date_notified',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sort_order' => 'DESC',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'page_arg' => 'npage',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'page' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 25,
</span><span class="cx" style="display: block; padding: 0 10px"> 'max' => null,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'page_arg' => 'npage',
</del><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"> // Overrides
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,10 +317,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->search_terms = $r['search_terms'];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->order_by = $r['order_by'];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sort_order = $r['sort_order'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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,
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Setup the notifications to loop through
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->notifications = BP_Notifications_Notification::get( $r );
- $this->total_notification_count = BP_Notifications_Notification::get_total_count( $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->notifications = BP_Notifications_Notification::get( $this->query_vars );
+ $this->total_notification_count = BP_Notifications_Notification::get_total_count( $this->query_vars );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->notifications ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->notification_count = 0;
</span></span></pre></div>
<a id="branches22testsphpunittestcasesnotificationsclassbpnotificationsnotificationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.2/tests/phpunit/testcases/notifications/class-bp-notifications-notification.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.2/tests/phpunit/testcases/notifications/class-bp-notifications-notification.php 2015-03-01 13:34:15 UTC (rev 9570)
+++ branches/2.2/tests/phpunit/testcases/notifications/class-bp-notifications-notification.php 2015-03-01 13:36:46 UTC (rev 9571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,4 +279,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_list_pluck( $n, 'id' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @group pagination
+ * @group BP6229
+ */
+ public function test_get_paged_sql() {
+ $u = $this->factory->user->create();
+
+ $notifications = array();
+ for ( $i = 1; $i <= 6; $i++ ) {
+ $notifications[] = $this->factory->notification->create( array(
+ 'component_name' => 'activity',
+ 'secondary_item_id' => $i,
+ 'user_id' => $u,
+ 'is_new' => true,
+ ) );
+ }
+
+ $found = BP_Notifications_Notification::get( array(
+ 'user_id' => $u,
+ 'is_new' => true,
+ 'page' => 2,
+ 'per_page' => 2,
+ 'order_by' => 'id',
+ ) );
+
+ // Check that the correct number of items are pulled up
+ $expected = array( $notifications[2], $notifications[3] );
+ $this->assertEquals( $expected, wp_list_pluck( $found, 'id' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches22testsphpunittestcasesnotificationsclassbpnotificationstemplatephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/2.2/tests/phpunit/testcases/notifications/class-bp-notifications-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.2/tests/phpunit/testcases/notifications/class-bp-notifications-template.php (rev 0)
+++ branches/2.2/tests/phpunit/testcases/notifications/class-bp-notifications-template.php 2015-03-01 13:36:46 UTC (rev 9571)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,41 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group notifications
+ * @group template
+ */
+
+class BP_Tests_Notifications_BPNotificationsTemplate extends BP_UnitTestCase {
+ /**
+ * @group pagination
+ * @group BP6229
+ */
+ public function test_pagination_params_in_url_should_be_passed_to_query() {
+ $u = $this->factory->user->create();
+
+ $notifications = array();
+ for ( $i = 1; $i <= 6; $i++ ) {
+ $notifications[] = $this->factory->notification->create( array(
+ 'component_name' => 'activity',
+ 'secondary_item_id' => $i,
+ 'user_id' => $u,
+ 'is_new' => true,
+ ) );
+ }
+
+ $_REQUEST['npage'] = 2;
+
+ $template = new BP_Notifications_Template( array(
+ 'user_id' => $u,
+ 'is_new' => true,
+ 'per_page' => 2,
+ 'order_by' => 'id',
+ ) );
+
+ unset( $_REQUEST['npage'] );
+
+ // Check that the correct number of items are pulled up
+ $expected = array( $notifications[3], $notifications[2] );
+ $this->assertEquals( $expected, wp_list_pluck( $template->notifications, 'id' ) );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>