<!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][4622] trunk/bp-messages: Introduces bp_get_messages_slug() and bp_messages_slug() template tags.</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>4622</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-06 20:02:44 +0000 (Wed, 06 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduces bp_get_messages_slug() and bp_messages_slug() template tags. Ports Messages Component notification items to the WP Admin Bar. References #3294</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagesfunctionsphp">trunk/bp-messages/bp-messages-functions.php</a></li>
<li><a href="#trunkbpmessagesbpmessagestemplatephp">trunk/bp-messages/bp-messages-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-functions.php (4621 => 4622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-functions.php 2011-07-06 19:35:51 UTC (rev 4621)
+++ trunk/bp-messages/bp-messages-functions.php 2011-07-06 20:02:44 UTC (rev 4622)
</span><span class="lines">@@ -211,18 +211,44 @@
</span><span class="cx"> * notifications for the user and for this specific component.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-function messages_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
</del><ins>+/**
+ * Format the BuddyBar/admin bar notifications for the Messages component
+ *
+ * @package BuddyPress
+ *
+ * @param str $action The kind of notification being rendered
+ * @param int $item_id The primary item id
+ * @param int $secondary_item_id The secondary item id
+ * @param int $total_items The total number of messaging-related notifications waiting for the user
+ * @param str $format 'string' for BuddyBar-compatible notifications; 'array' for WP Admin Bar
+ */
+function messages_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"> if ( 'new_message' == $action ) {
</span><del>- if ( (int)$total_items > 1 )
- return apply_filters( 'bp_messages_multiple_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="' . __( 'Inbox', 'buddypress' ) . '">' . sprintf( __('You have %d new messages', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
- else
- return apply_filters( 'bp_messages_single_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="' . __( 'Inbox', 'buddypress' ) . '">' . sprintf( __('You have %d new message', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
</del><ins>+ $link = bp_loggedin_user_domain() . bp_get_messages_slug() . '/inbox';
+ $title = __( 'Inbox', 'buddypress' );
+
+ if ( (int)$total_items > 1 ) {
+ $text = sprintf( __('You have %d new messages', 'buddypress' ), (int)$total_items );
+ $filter = 'bp_messages_multiple_new_message_notification';
+ } else {
+ $text = sprintf( __('You have %d new message', 'buddypress' ), (int)$total_items );
+ $filter = 'bp_messages_single_new_message_notification';
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( 'string' == $format ) {
+ $return = apply_filters( $filter, '<a href="' . $link . '" title="' . $title . '">' . $text . '</a>', (int)$total_items, $text, $link );
+ } else {
+ $return = apply_filters( $filter, array(
+ 'text' => $text,
+ 'link' => $at_mention_link
+ ), $at_mention_link, (int)$total_items, $text, $link );
+ }
+
</ins><span class="cx"> do_action( 'messages_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">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-template.php (4621 => 4622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-template.php 2011-07-06 19:35:51 UTC (rev 4621)
+++ trunk/bp-messages/bp-messages-template.php 2011-07-06 20:02:44 UTC (rev 4622)
</span><span class="lines">@@ -495,6 +495,30 @@
</span><span class="cx"> return apply_filters( 'bp_message_activate_deactivate_text', $text );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Output the messages component slug
+ *
+ * @package BuddyPress
+ * @subpackage Messages Template
+ * @since BuddyPress 1.3
+ *
+ * @uses bp_get_messages_slug()
+ */
+function bp_messages_slug() {
+ echo bp_get_messages_slug();
+}
+ /**
+ * Return the messages component slug
+ *
+ * @package BuddyPress
+ * @subpackage Messages Template
+ * @since BuddyPress 1.3
+ */
+ function bp_get_messages_slug() {
+ global $bp;
+ return apply_filters( 'bp_get_messages_slug', $bp->messages->slug );
+ }
+
</ins><span class="cx"> function bp_message_get_notices() {
</span><span class="cx"> global $userdata;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>