<!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][9925] trunk/src/bp-messages/classes/class-bp_messages-thread.php: Messages: Whitespace & type-casting in `class-bp_messages-thread.php`</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/9925">9925</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/9925","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-06-11 02:18:26 +0000 (Thu, 11 Jun 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'>Messages: Whitespace & type-casting in `class-bp_messages-thread.php`</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmessagesclassesclassbp_messagesthreadphp">trunk/src/bp-messages/classes/class-bp_messages-thread.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmessagesclassesclassbp_messagesthreadphp"></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/classes/class-bp_messages-thread.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/classes/class-bp_messages-thread.php 2015-06-11 02:15:18 UTC (rev 9924)
+++ trunk/src/bp-messages/classes/class-bp_messages-thread.php 2015-06-11 02:18:26 UTC (rev 9925)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class BP_Messages_Thread {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The message thread ID.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,22 +138,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool False on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function populate( $thread_id = 0, $order = 'ASC', $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( 'ASC' != $order && 'DESC' != $order ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ASC' !== $order && 'DESC' !== $order ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $order = 'ASC';
</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"> // merge $args with our defaults
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_id' => bp_loggedin_user_id(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'update_meta_cache' => true
</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->messages_order = $order;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->thread_id = $thread_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->thread_id = (int) $thread_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // get messages for thread
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->messages = self::get_messages( $thread_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->messages = self::get_messages( $this->thread_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->messages ) || is_wp_error( $this->messages ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,15 +165,15 @@
</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"> foreach ( (array) $this->messages as $key => $message ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sender_ids[$message->sender_id] = $message->sender_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sender_ids[ $message->sender_id ] = $message->sender_id;
</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"> // Fetch the recipients
</span><span class="cx" style="display: block; padding: 0 10px"> $this->recipients = $this->get_recipients();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the unread count for the logged in user
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $this->recipients[bp_loggedin_user_id()] ) ) {
- $this->unread_count = $this->recipients[bp_loggedin_user_id()]->unread_count;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $this->recipients[ $r['user_id'] ] ) ) {
+ $this->unread_count = $this->recipients[ $r['user_id'] ]->unread_count;
</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"> // Grab all message meta
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,12 +230,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $thread_id = $this->thread_id;
</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">+ $thread_id = (int) $thread_id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $recipients = wp_cache_get( 'thread_recipients_' . $thread_id, 'bp_messages' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $recipients ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $recipients = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $results = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $thread_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sql = $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_recipients} WHERE thread_id = %d", $thread_id );
+ $results = $wpdb->get_results( $sql );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $results as $recipient ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $recipients[ $recipient->user_id ] = $recipient;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +270,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_messages( $thread_id = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $messages = wp_cache_get( $thread_id, 'bp_messages_threads' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thread_id = (int) $thread_id;
+ $messages = wp_cache_get( $thread_id, 'bp_messages_threads' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $messages ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,9 +313,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function delete( $thread_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function delete( $thread_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thread_id = (int) $thread_id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before a message thread is marked as deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,6 +359,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Do something for each message ID
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $message_ids as $message_id ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Delete message meta
</span><span class="cx" style="display: block; padding: 0 10px"> bp_messages_delete_meta( $message_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,7 +429,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args = bp_core_parse_args_array( $old_args_keys, $func_args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $defaults = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r = bp_parse_args( $args, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'box' => 'inbox',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'all',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,8 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'search_terms' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
- $r = wp_parse_args( $args, $defaults );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pag_sql = $type_sql = $search_sql = $user_id_sql = $sender_sql = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_query_sql = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,12 +501,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sort threads by date_sent
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( (array) $thread_ids as $thread ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sorted_threads[$thread->thread_id] = strtotime( $thread->date_sent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sorted_threads[ $thread->thread_id ] = strtotime( $thread->date_sent );
</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"> arsort( $sorted_threads );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $threads = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $threads = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $sorted_threads as $thread_id => $date_sent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $threads[] = new BP_Messages_Thread( $thread_id, 'ASC', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_meta_cache' => false
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +523,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $total_threads Number of threads found by the query.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'bp_messages_thread_current_threads', array( 'threads' => &$threads, 'total' => (int) $total_threads ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'bp_messages_thread_current_threads', array(
+ 'threads' => &$threads,
+ 'total' => (int) $total_threads
+ ) );
</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">@@ -560,12 +570,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $thread_id The message thread ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function mark_as_read( $thread_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function mark_as_read( $thread_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", bp_loggedin_user_id(), $thread_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->query($sql);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->query( $sql );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'thread_recipients_' . $thread_id, 'bp_messages' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( bp_loggedin_user_id(), 'bp_messages_unread_count' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,12 +588,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $thread_id The message thread ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function mark_as_unread( $thread_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function mark_as_unread( $thread_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", bp_loggedin_user_id(), $thread_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->query($sql);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->query( $sql );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'thread_recipients_' . $thread_id, 'bp_messages' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( bp_loggedin_user_id(), 'bp_messages_unread_count' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,18 +614,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_total_threads_for_user( $user_id, $box = 'inbox', $type = 'all' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exclude_sender = '';
- if ( $box != 'sentbox' )
- $exclude_sender = ' AND sender_only != 1';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exclude_sender = $type_sql = '';
+ if ( $box !== 'sentbox' ) {
+ $exclude_sender = 'AND sender_only != 1';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $type == 'unread' )
- $type_sql = " AND unread_count != 0 ";
- elseif ( $type == 'read' )
- $type_sql = " AND unread_count = 0 ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $type === 'unread' ) {
+ $type_sql = 'AND unread_count != 0';
+ } elseif ( $type === 'read' ) {
+ $type_sql = 'AND unread_count = 0';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0{$exclude_sender} {$type_sql}", $user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0 {$exclude_sender} {$type_sql}", $user_id ) );
</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">@@ -634,7 +646,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sender_ids = $wpdb->get_col( $wpdb->prepare( "SELECT sender_id FROM {$bp->messages->table_name_messages} WHERE thread_id = %d", $thread_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $sender_ids ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $sender_ids ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">@@ -710,14 +722,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|null The recorded recipient ID on success, null on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function check_access( $thread_id, $user_id = 0 ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = bp_loggedin_user_id();
</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"> $recipients = self::get_recipients_for_thread( $thread_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $recipients[$user_id] ) && 0 == $recipients[$user_id]->is_deleted ) {
- return $recipients[$user_id]->id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $recipients[ $user_id ] ) && 0 == $recipients[ $user_id ]->is_deleted ) {
+ return $recipients[ $user_id ]->id;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -733,6 +746,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|null The message thread ID on success, null on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function is_valid( $thread_id = 0 ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Bail if no thread ID is passed
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $thread_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -762,8 +776,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_recipient_links( $recipients ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( count( $recipients ) >= 5 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( count( $recipients ) >= 5 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( '%s Recipients', 'buddypress' ), number_format_i18n( count( $recipients ) ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient_links = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -805,19 +821,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( (array) $threads as $thread ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message_ids = maybe_unserialize( $thread->message_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $message_ids ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $message_ids ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message_ids = implode( ',', $message_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the thread_id to the messages table
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_messages} SET thread_id = %d WHERE id IN ({$message_ids})", $thread->id ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_messages} SET thread_id = %d WHERE id IN ({$message_ids})", $thread->id ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors = true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $errors ) {
- return false;
- }
-
- return true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (bool) ! $errors;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>