<!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][8931] trunk/src: Correctly generate pagination links when using AJAX and search terms have been set.</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8931">8931</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2014-08-17 09:56:37 +0000 (Sun, 17 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correctly generate pagination links when using AJAX and search terms have been set.
Also improve pagination support for main loops in the Groups/Members/Messages components when JS is disabled.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5768">#5768</a>, props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunksrcbptemplatesbplegacyjsbuddypressjs">trunk/src/bp-templates/bp-legacy/js/buddypress.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-template.php (8930 => 8931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-template.php 2014-08-16 12:30:40 UTC (rev 8930)
+++ trunk/src/bp-groups/bp-groups-template.php 2014-08-17 09:56:37 UTC (rev 8931)
</span><span class="lines">@@ -234,8 +234,25 @@
</span><span class="cx">
</span><span class="cx"> // Build pagination links
</span><span class="cx"> if ( (int) $this->total_group_count && (int) $this->pag_num ) {
</span><ins>+ $pag_args = array(
+ $page_arg => '%#%',
+ 'num' => $this->pag_num,
+ 'sortby' => $this->sort_by,
+ 'order' => $this->order,
+ );
+
+ if ( defined( 'DOING_AJAX' ) && true === (bool) DOING_AJAX ) {
+ $base = remove_query_arg( 's', wp_get_referer() );
+ } else {
+ $base = '';
+ }
+
+ if ( ! empty( $search_terms ) ) {
+ $pag_args['s'] = $search_terms;
+ }
+
</ins><span class="cx"> $this->pag_links = paginate_links( array(
</span><del>- 'base' => add_query_arg( array( $page_arg => '%#%', 'num' => $this->pag_num, 's' => $search_terms, 'sortby' => $this->sort_by, 'order' => $this->order ) ),
</del><ins>+ 'base' => add_query_arg( $pag_args, $base ),
</ins><span class="cx"> 'format' => '',
</span><span class="cx"> 'total' => ceil( (int) $this->total_group_count / (int) $this->pag_num ),
</span><span class="cx"> 'current' => $this->pag_page,
</span></span></pre></div>
<a id="trunksrcbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-template.php (8930 => 8931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-template.php 2014-08-16 12:30:40 UTC (rev 8930)
+++ trunk/src/bp-members/bp-members-template.php 2014-08-17 09:56:37 UTC (rev 8931)
</span><span class="lines">@@ -264,8 +264,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( (int) $this->total_member_count && (int) $this->pag_num ) {
</span><ins>+ $pag_args = array(
+ $page_arg => '%#%',
+ );
+
+ if ( defined( 'DOING_AJAX' ) && true === (bool) DOING_AJAX ) {
+ $base = remove_query_arg( 's', wp_get_referer() );
+ } else {
+ $base = '';
+ }
+
+ if ( ! empty( $search_terms ) ) {
+ $pag_args['s'] = $search_terms;
+ }
+
</ins><span class="cx"> $this->pag_links = paginate_links( array(
</span><del>- 'base' => add_query_arg( $page_arg, '%#%' ),
</del><ins>+ 'base' => add_query_arg( $pag_args, $base ),
</ins><span class="cx"> 'format' => '',
</span><span class="cx"> 'total' => ceil( (int) $this->total_member_count / (int) $this->pag_num ),
</span><span class="cx"> 'current' => (int) $this->pag_page,
</span></span></pre></div>
<a id="trunksrcbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-messages/bp-messages-template.php (8930 => 8931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-messages/bp-messages-template.php 2014-08-16 12:30:40 UTC (rev 8930)
+++ trunk/src/bp-messages/bp-messages-template.php 2014-08-17 09:56:37 UTC (rev 8931)
</span><span class="lines">@@ -173,8 +173,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( (int) $this->total_thread_count && (int) $this->pag_num ) {
</span><ins>+ $pag_args = array(
+ $page_arg => '%#%',
+ );
+
+ if ( defined( 'DOING_AJAX' ) && true === (bool) DOING_AJAX ) {
+ $base = remove_query_arg( 's', wp_get_referer() );
+ } else {
+ $base = '';
+ }
+
+ if ( ! empty( $this->search_terms ) ) {
+ $pag_args['s'] = $this->search_terms;
+ }
+
</ins><span class="cx"> $this->pag_links = paginate_links( array(
</span><del>- 'base' => add_query_arg( $page_arg, '%#%' ),
</del><ins>+ 'base' => add_query_arg( $pag_args, $base ),
</ins><span class="cx"> 'format' => '',
</span><span class="cx"> 'total' => ceil( (int) $this->total_thread_count / (int) $this->pag_num ),
</span><span class="cx"> 'current' => $this->pag_page,
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacyjsbuddypressjs"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-templates/bp-legacy/js/buddypress.js (8930 => 8931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-templates/bp-legacy/js/buddypress.js 2014-08-16 12:30:40 UTC (rev 8930)
+++ trunk/src/bp-templates/bp-legacy/js/buddypress.js 2014-08-17 09:56:37 UTC (rev 8931)
</span><span class="lines">@@ -1689,10 +1689,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( bp_get_querystring('s') && !search_terms ) {
- search_terms = bp_get_querystring('s');
- }
-
</del><span class="cx"> if ( null === scope ) {
</span><span class="cx"> scope = 'all';
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>