<!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][9260] trunk/src: Make sure paginate links are correctly set in case javascript is disabled</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/9260">9260</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/9260","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-23 01:00:46 +0000 (Tue, 23 Dec 2014)</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'>Make sure paginate links are correctly set in case javascript is disabled
Adding extra query arguments to the 'base' parameter of the {{{paginate_links()}}} function when javascript is disabled is preventing the loops to be correctly paginated. In this particular case, the pagination is 'stuck' on the second page. To be sure the pagination is correctly set, we need to pass extra query arguments using the 'add_args' parameter of the {{{paginate_links()}}} function.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5967">#5967</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivitytemplatephp">trunk/src/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunksrcbpblogsbpblogstemplatephp">trunk/src/bp-blogs/bp-blogs-template.php</a></li>
<li><a href="#trunksrcbpforumsbpforumstemplatephp">trunk/src/bp-forums/bp-forums-template.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunksrcbpmembersbpmemberstemplatephp">trunk/src/bp-members/bp-members-template.php</a></li>
<li><a href="#trunksrcbpmessagesbpmessagestemplatephp">trunk/src/bp-messages/bp-messages-template.php</a></li>
<li><a href="#trunksrcbpnotificationsbpnotificationstemplatephp">trunk/src/bp-notifications/bp-notifications-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-template.php 2014-12-22 23:47:16 UTC (rev 9259)
+++ trunk/src/bp-activity/bp-activity-template.php 2014-12-23 01:00:46 UTC (rev 9260)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,7 +314,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => (int) $this->pag_page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => _x( '←', 'Activity pagination previous text', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => _x( '→', 'Activity pagination next text', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mid_size' => 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mid_size' => 1,
+ 'add_args' => array(),
</ins><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"> }
</span></span></pre></div>
<a id="trunksrcbpblogsbpblogstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-template.php 2014-12-22 23:47:16 UTC (rev 9259)
+++ trunk/src/bp-blogs/bp-blogs-template.php 2014-12-23 01:00:46 UTC (rev 9260)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => (int) $this->pag_page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => _x( '←', 'Blog pagination previous text', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => _x( '→', 'Blog pagination next text', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mid_size' => 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mid_size' => 1,
+ 'add_args' => array(),
</ins><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"> }
</span></span></pre></div>
<a id="trunksrcbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-forums/bp-forums-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-forums/bp-forums-template.php 2014-12-22 23:47:16 UTC (rev 9259)
+++ trunk/src/bp-forums/bp-forums-template.php 2014-12-23 01:00:46 UTC (rev 9260)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,7 +295,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => $this->pag_page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => _x( '←', 'Forum topic pagination previous text', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => _x( '→', 'Forum topic pagination next text', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mid_size' => 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mid_size' => 1,
+ 'add_args' => array(),
</ins><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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,7 +568,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => $forum_template->pag_page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => _x( '←', 'Forum topic pagination previous text', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => _x( '→', 'Forum topic pagination next text', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mid_size' => 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mid_size' => 1,
+ 'add_args' => array(),
</ins><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"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1735,7 +1737,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => $this->pag_page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => _x( '←', 'Forum thread pagination previous text', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => _x( '→', 'Forum thread pagination next text', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mid_size' => 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mid_size' => 1,
+ 'add_args' => array(),
</ins><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"> $this->pag->total_pages = ceil( (int) $this->total_post_count / (int) $this->pag_num );
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-template.php 2014-12-22 23:47:16 UTC (rev 9259)
+++ trunk/src/bp-groups/bp-groups-template.php 2014-12-23 01:00:46 UTC (rev 9260)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,10 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Build pagination links
</span><span class="cx" style="display: block; padding: 0 10px"> if ( (int) $this->total_group_count && (int) $this->pag_num ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pag_args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_arg => '%#%',
- 'num' => $this->pag_num,
- 'sortby' => $this->sort_by,
- 'order' => $this->order,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_arg => '%#%'
</ins><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"> if ( defined( 'DOING_AJAX' ) && true === (bool) DOING_AJAX ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,8 +319,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $base = '';
</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">+ $add_args = array(
+ 'num' => $this->pag_num,
+ 'sortby' => $this->sort_by,
+ 'order' => $this->order,
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $search_terms ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pag_args['s'] = $search_terms;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $add_args['s'] = urlencode( $search_terms );
</ins><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"> $this->pag_links = paginate_links( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,7 +336,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => $this->pag_page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => _x( '←', 'Group pagination previous text', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => _x( '→', 'Group pagination next text', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mid_size' => 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mid_size' => 1,
+ 'add_args' => $add_args,
</ins><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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3038,13 +3042,14 @@
</span><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"> $this->pag_links = paginate_links( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'base' => add_query_arg( array( 'mlpage' => '%#%' ), $base_url ),
- 'format' => '',
- 'total' => !empty( $this->pag_num ) ? ceil( $this->total_member_count / $this->pag_num ) : $this->total_member_count,
- 'current' => $this->pag_page,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'base' => add_query_arg( array( 'mlpage' => '%#%' ), $base_url ),
+ 'format' => '',
+ 'total' => ! empty( $this->pag_num ) ? ceil( $this->total_member_count / $this->pag_num ) : $this->total_member_count,
+ 'current' => $this->pag_page,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => '←',
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => '→',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mid_size' => 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mid_size' => 1,
+ 'add_args' => array(),
</ins><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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4069,13 +4074,14 @@
</span><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"> $this->pag_links = paginate_links( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'base' => add_query_arg( 'mrpage', '%#%' ),
- 'format' => '',
- 'total' => ceil( $this->total_request_count / $this->pag_num ),
- 'current' => $this->pag_page,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'base' => add_query_arg( 'mrpage', '%#%' ),
+ 'format' => '',
+ 'total' => ceil( $this->total_request_count / $this->pag_num ),
+ 'current' => $this->pag_page,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => '←',
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => '→',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mid_size' => 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mid_size' => 1,
+ 'add_args' => array(),
</ins><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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4321,6 +4327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => '←',
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => '→',
</span><span class="cx" style="display: block; padding: 0 10px"> 'mid_size' => 1,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'add_args' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->pag_links = '';
</span></span></pre></div>
<a id="trunksrcbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-template.php 2014-12-22 23:47:16 UTC (rev 9259)
+++ trunk/src/bp-members/bp-members-template.php 2014-12-23 01:00:46 UTC (rev 9260)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,8 +275,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $base = '';
</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">+ /**
+ * Defaults to an empty array to make sure paginate_links()
+ * won't add the $page_arg to the links which would break
+ * pagination in case javascript is disabled.
+ */
+ $add_args = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $search_terms ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pag_args['s'] = urlencode( $search_terms );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $add_args['s'] = urlencode( $search_terms );
</ins><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"> $this->pag_links = paginate_links( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +293,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => (int) $this->pag_page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => _x( '←', 'Member pagination previous text', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => _x( '→', 'Member pagination next text', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mid_size' => 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mid_size' => 1,
+ 'add_args' => $add_args,
</ins><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"> }
</span></span></pre></div>
<a id="trunksrcbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/bp-messages-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-template.php 2014-12-22 23:47:16 UTC (rev 9259)
+++ trunk/src/bp-messages/bp-messages-template.php 2014-12-23 01:00:46 UTC (rev 9260)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,8 +183,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $base = '';
</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">+ $add_args = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->search_terms ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pag_args['s'] = $this->search_terms;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $add_args['s'] = $this->search_terms;
</ins><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"> $this->pag_links = paginate_links( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +196,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => $this->pag_page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => _x( '←', 'Message pagination previous text', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => _x( '→', 'Message pagination next text', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mid_size' => 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mid_size' => 1,
+ 'add_args' => $add_args,
</ins><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"> }
</span></span></pre></div>
<a id="trunksrcbpnotificationsbpnotificationstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-notifications/bp-notifications-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-notifications/bp-notifications-template.php 2014-12-22 23:47:16 UTC (rev 9259)
+++ trunk/src/bp-notifications/bp-notifications-template.php 2014-12-23 01:00:46 UTC (rev 9260)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,6 +301,10 @@
</span><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"> if ( (int) $this->total_notification_count && (int) $this->pag_num ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $add_args = array(
+ 'sort_order' => $this->sort_order,
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->pag_links = paginate_links( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'base' => add_query_arg( $this->page_arg, '%#%' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'format' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,6 +313,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'prev_text' => _x( '←', 'Notifications pagination previous text', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'next_text' => _x( '→', 'Notifications pagination next text', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'mid_size' => 1,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'add_args' => $add_args,
</ins><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"> // Remove first page from pagination
</span></span></pre>
</div>
</div>
</body>
</html>