<!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][4782] trunk: Fix issue where private messages could not be marked as read, unread, or deleted.</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, #logmsg > ol { margin-left: 0; 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/4782">4782</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-07-22 09:20:56 +0000 (Fri, 22 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix issue where private messages could not be marked as read, unread, or deleted. See <a href="http://buddypress.trac.wordpress.org/ticket/3367">#3367</a>, <a href="http://buddypress.trac.wordpress.org/ticket/3241">#3241</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagesloaderphp">trunk/bp-messages/bp-messages-loader.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagesloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-loader.php (4781 => 4782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-loader.php 2011-07-22 08:55:22 UTC (rev 4781)
+++ trunk/bp-messages/bp-messages-loader.php 2011-07-22 09:20:56 UTC (rev 4782)
</span><span class="lines">@@ -88,10 +88,7 @@
</span><span class="cx"> function setup_nav() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( $count = bp_get_total_unread_messages_count() )
- $name = sprintf( __( 'Messages <span class="count">%s</span>', 'buddypress' ), $count );
- else
- $name = __( 'Messages', 'buddypress' );
</del><ins>+ $name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
</ins><span class="cx">
</span><span class="cx"> // Add 'Messages' to the main navigation
</span><span class="cx"> $main_nav = array(
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (4781 => 4782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2011-07-22 08:55:22 UTC (rev 4781)
+++ trunk/bp-themes/bp-default/_inc/global.js 2011-07-22 09:20:56 UTC (rev 4782)
</span><span class="lines">@@ -923,19 +923,21 @@
</span><span class="cx">
</span><span class="cx"> jq('tr#m-' + jq(this).attr('value') + ' td span.unread-count').html(unreadCount);
</span><span class="cx"> jq('tr#m-' + jq(this).attr('value') + ' td span.unread-count').css('display', unreadCountDisplay);
</span><del>- var inboxcount = jq('a#user-messages strong').html().substr( 1, jq('a#user-messages strong').html().length );
</del><ins>+
+ var inboxcount = jq('a#user-messages span').html().substr( 1, jq('a#user-messages span').html().length );
</ins><span class="cx"> var inboxcount = inboxcount.substr( 0, inboxcount.length - 1 );
</span><span class="cx">
</span><span class="cx"> if ( !inboxcount.length )
</span><span class="cx"> inboxcount = 0;
</span><ins>+
</ins><span class="cx"> if ( parseInt(inboxcount) == inboxCount ) {
</span><del>- jq('a#user-messages strong').css('display', unreadCountDisplay);
- jq('a#user-messages strong').html( '(' + unreadCount + ')' );
</del><ins>+ jq('a#user-messages span').css('display', unreadCountDisplay);
+ jq('a#user-messages span').html( unreadCount );
</ins><span class="cx"> } else {
</span><span class="cx"> if ( 'read' == currentClass )
</span><del>- jq('a#user-messages strong').html('(' + ( parseInt(inboxcount) + 1 ) + ')');
</del><ins>+ jq('a#user-messages span').html( ( parseInt(inboxcount) + 1 ) );
</ins><span class="cx"> else
</span><del>- jq('a#user-messages strong').html('(' + ( parseInt(inboxcount) - thread_count ) + ')');
</del><ins>+ jq('a#user-messages span').html( ( parseInt(inboxcount) - thread_count ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( i != checkboxes.length - 1 ) {
</span></span></pre>
</div>
</div>
</body>
</html>