<!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][7924] trunk/bp-messages/bp-messages-template.php: Clean up `bp_has_message_threads()`:</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/7924">7924</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-02-18 17:03:52 +0000 (Tue, 18 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up `bp_has_message_threads()`:
* Move default box ahead of argument parsing so it can be overridden VS being forced.
* Remove unused `$bp` global.
* Use `bp_parse_args()` so arguments can be filtered before they are queried.
* Pass `$r` into `bp_has_message_threads` filter.
* Add inline documentation and phpdoc block.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagestemplatephp">trunk/bp-messages/bp-messages-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-template.php (7923 => 7924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-template.php 2014-02-18 16:47:45 UTC (rev 7923)
+++ trunk/bp-messages/bp-messages-template.php 2014-02-18 17:03:52 UTC (rev 7924)
</span><span class="lines">@@ -165,37 +165,59 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Retrieve private message threads for display in inbox/sentbox/notices
+ *
+ * Similar to WordPress's have_posts() function, this function is responsible
+ * for querying the database and retrieving private messages for display inside
+ * the theme via individual template parts for a member's inbox/sentbox/notices.
+ *
+ * @since BuddyPress (1.0.0)
+ *
+ * @global BP_Messages_Box_Template $messages_template
+ * @param array $args
+ * @return object
+ */
</ins><span class="cx"> function bp_has_message_threads( $args = '' ) {
</span><del>- global $bp, $messages_template;
</del><ins>+ global $messages_template;
</ins><span class="cx">
</span><del>- $defaults = array(
</del><ins>+ // The default box the user is looking at
+ if ( bp_is_current_action( 'sentbox' ) ) {
+ $default_box = 'sentbox';
+ } elseif ( bp_is_current_action( 'notices' ) ) {
+ $default_box = 'notices';
+ } else {
+ $default_box = 'inbox';
+ }
+
+ // Parse the arguments
+ $r = bp_parse_args( $args, array(
</ins><span class="cx"> 'user_id' => bp_loggedin_user_id(),
</span><del>- 'box' => 'inbox',
</del><ins>+ 'box' => $default_box,
</ins><span class="cx"> 'per_page' => 10,
</span><span class="cx"> 'max' => false,
</span><span class="cx"> 'type' => 'all',
</span><span class="cx"> 'search_terms' => isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '',
</span><span class="cx"> 'page_arg' => 'mpage', // See https://buddypress.trac.wordpress.org/ticket/3679
</span><del>- );
</del><ins>+ ), 'has_message_threads' );
</ins><span class="cx">
</span><del>- $r = wp_parse_args( $args, $defaults );
- extract( $r, EXTR_SKIP );
-
</del><ins>+ // If trying to access notices without capabilities, redirect to root domain
</ins><span class="cx"> if ( bp_is_current_action( 'notices' ) && !bp_current_user_can( 'bp_moderate' ) ) {
</span><span class="cx"> bp_core_redirect( bp_displayed_user_domain() );
</span><del>- } else {
- if ( bp_is_current_action( 'sentbox' ) ) {
- $box = 'sentbox';
- }
</del><ins>+ }
</ins><span class="cx">
</span><del>- if ( bp_is_current_action( 'notices' ) ) {
- $box = 'notices';
- }
</del><ins>+ // Load the messages loop global up with messages
+ $messages_template = new BP_Messages_Box_Template(
+ $r['user_id'],
+ $r['box'],
+ $r['per_page'],
+ $r['max'],
+ $r['type'],
+ $r['search_terms'],
+ $r['page_arg']
+ );
</ins><span class="cx">
</span><del>- $messages_template = new BP_Messages_Box_Template( $user_id, $box, $per_page, $max, $type, $search_terms, $page_arg );
- }
-
- return apply_filters( 'bp_has_message_threads', $messages_template->has_threads(), $messages_template );
</del><ins>+ return apply_filters( 'bp_has_message_threads', $messages_template->has_threads(), $messages_template, $r );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_message_threads() {
</span></span></pre>
</div>
</div>
</body>
</html>