<!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][4621] trunk: Adds WP Admin Bar notification support for Activity component.</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>4621</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-06 19:35:51 +0000 (Wed, 06 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds WP Admin Bar notification support for Activity component. References #3294</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpactivitybpactivityloaderphp">trunk/bp-activity/bp-activity-loader.php</a></li>
<li><a href="#trunkbpmembersbpmembersnotificationsphp">trunk/bp-members/bp-members-notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (4620 => 4621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2011-07-06 19:10:08 UTC (rev 4620)
+++ trunk/bp-activity/bp-activity-functions.php 2011-07-06 19:35:51 UTC (rev 4621)
</span><span class="lines">@@ -112,12 +112,13 @@
</span><span class="cx"> * Formats notifications related to activity
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Activity
</span><del>- * @param $action The type of activity item. Just 'new_at_mention' for now
- * @param $item_id The activity id
- * @param $secondary_item_id In the case of at-mentions, this is the mentioner's id
- * @param $total_items The total number of notifications to format
</del><ins>+ * @param str $action The type of activity item. Just 'new_at_mention' for now
+ * @param int $item_id The activity id
+ * @param int $secondary_item_id In the case of at-mentions, this is the mentioner's id
+ * @param int $total_items The total number of notifications to format
+ * @param str $format 'string' to get a BuddyBar-compatible notification, 'array' otherwise
</ins><span class="cx"> */
</span><del>-function bp_activity_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
</del><ins>+function bp_activity_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> switch ( $action ) {
</span><span class="lines">@@ -128,18 +129,28 @@
</span><span class="cx"> $at_mention_title = sprintf( __( '@%s Mentions', 'buddypress' ), $bp->loggedin_user->userdata->user_nicename );
</span><span class="cx">
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><del>- return apply_filters( 'bp_activity_multiple_at_mentions_notification', '<a href="' . $at_mention_link . '" title="' . $at_mention_title . '">' . sprintf( __( 'You have %1$d new activity mentions', 'buddypress' ), (int)$total_items ) . '</a>', $at_mention_link, $total_items, $activity_id, $poster_user_id );
</del><ins>+ $text = sprintf( __( 'You have %1$d new activity mentions', 'buddypress' ), (int)$total_items );
+ $filter = 'bp_activity_multiple_at_mentions_notification';
</ins><span class="cx"> } else {
</span><span class="cx"> $user_fullname = bp_core_get_user_displayname( $poster_user_id );
</span><del>-
- return apply_filters( 'bp_activity_single_at_mentions_notification', '<a href="' . $at_mention_link . '" title="' . $at_mention_title . '">' . sprintf( __( '%1$s mentioned you in an activity update', 'buddypress' ), $user_fullname ) . '</a>', $at_mention_link, $total_items, $activity_id, $poster_user_id );
</del><ins>+ $text = sprintf( __( '%1$s mentioned you in an activity update', 'buddypress' ), $user_fullname );
+ $filter = 'bp_activity_single_at_mentions_notification';
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
+ if ( 'string' == $format ) {
+ $return = apply_filters( $filter, '<a href="' . $at_mention_link . '" title="' . $at_mention_title . '">' . $text . '</a>', $at_mention_link, (int)$total_items, $activity_id, $poster_user_id );
+ } else {
+ $return = apply_filters( $filter, array(
+ 'text' => $text,
+ 'link' => $at_mention_link
+ ), $at_mention_link, (int)$total_items, $activity_id, $poster_user_id );
+ }
</ins><span class="cx">
</span><span class="cx"> do_action( 'activity_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
</span><span class="cx">
</span><del>- return false;
</del><ins>+ return $return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Actions *******************************************************************/
</span></span></pre></div>
<a id="trunkbpactivitybpactivityloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-loader.php (4620 => 4621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-loader.php 2011-07-06 19:10:08 UTC (rev 4620)
+++ trunk/bp-activity/bp-activity-loader.php 2011-07-06 19:35:51 UTC (rev 4621)
</span><span class="lines">@@ -75,7 +75,8 @@
</span><span class="cx"> 'slug' => BP_ACTIVITY_SLUG,
</span><span class="cx"> 'root_slug' => isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : BP_ACTIVITY_SLUG,
</span><span class="cx"> 'search_string' => __( 'Search Activity...', 'buddypress' ),
</span><del>- 'global_tables' => $global_tables
</del><ins>+ 'global_tables' => $global_tables,
+ 'notification_callback' => 'bp_activity_format_notifications',
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> parent::_setup_globals( $globals );
</span></span></pre></div>
<a id="trunkbpmembersbpmembersnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-notifications.php (4620 => 4621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-notifications.php 2011-07-06 19:10:08 UTC (rev 4620)
+++ trunk/bp-members/bp-members-notifications.php 2011-07-06 19:35:51 UTC (rev 4621)
</span><span class="lines">@@ -56,8 +56,8 @@
</span><span class="cx">
</span><span class="cx"> if ( empty( $grouped_notifications ) )
</span><span class="cx"> return false;
</span><del>-
- // Calculated a renderable outcome for each notification type
</del><ins>+
+ // Calculate a renderable output for each notification type
</ins><span class="cx"> foreach ( (array)$grouped_notifications as $component_name => $action_arrays ) {
</span><span class="cx"> if ( !$action_arrays )
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
</body>
</html>