<!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][13035] trunk: Make the `new_message` notification filter consistent across formats</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 { white-space: pre-line; 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/13035">13035</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/13035","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-08-10 16:16:30 +0000 (Tue, 10 Aug 2021)</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'>Make the `new_message` notification filter consistent across formats
The 'bp_messages_' . $amount . '_new_message_notification' dynamic filter is including **6** parameters for the `string` format and **7** for the `array` format. This makes it difficult to use for Plugin developers.
To make things more consistent across formats, we are deprecating this filter in favor of a new dynamic filter `'bp_messages_' . $amount . '_new_message_' . $format . '_notification'`. FYI, possible filter names are:
- `'bp_messages_multiple_new_message_string_notification'`
- `'bp_messages_single_new_message_string_notification'`
- `'bp_messages_multiple_new_message_array_notification'`
- `'bp_messages_single_new_message_array_notification'`
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8546">#8546</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmessagesbpmessagesnotificationsphp">trunk/src/bp-messages/bp-messages-notifications.php</a></li>
<li><a href="#trunktestsphpunittestcasesmessagesnotificationsphp">trunk/tests/phpunit/testcases/messages/notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmessagesbpmessagesnotificationsphp"></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/bp-messages-notifications.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-notifications.php 2021-08-09 10:00:02 UTC (rev 13034)
+++ trunk/src/bp-messages/bp-messages-notifications.php 2021-08-10 16:16:30 UTC (rev 13035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $total_items > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $amount = 'multiple';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of new messages */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %d: number of new messages */
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( __( 'You have %d new messages', 'buddypress' ), $total_items );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,10 +41,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get message thread ID.
</span><span class="cx" style="display: block; padding: 0 10px"> $message = new BP_Messages_Message( $item_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $thread_id = $message->thread_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = ( ! empty( $thread_id ) )
- ? bp_get_message_thread_view_link( $thread_id )
- : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $thread_id ) ) {
+ $link = bp_get_message_thread_view_link( $thread_id );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $secondary_item_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: member name */
</span><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( __( '%s sent you a new private message', 'buddypress' ), bp_core_get_user_displayname( $secondary_item_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,39 +58,73 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'string' === $format ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $link ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return = '<a href="' . esc_url( $link ) . '">' . esc_html( $text ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval = '<a href="' . esc_url( $link ) . '">' . esc_html( $text ) . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return = esc_html( $text );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval = esc_html( $text );
</ins><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">- /**
- * Filters the new message notification text before the notification is created.
- *
- * This is a dynamic filter. Possible filter names are:
- * - 'bp_messages_multiple_new_message_notification'.
- * - 'bp_messages_single_new_message_notification'.
- *
- * @param string $return Notification text.
- * @param int $total_items Number of messages referred to by the notification.
- * @param string $text The raw notification test (ie, not wrapped in a link).
- * @param int $item_id ID of the associated item.
- * @param int $secondary_item_id ID of the secondary associated item.
- */
- $return = apply_filters( 'bp_messages_' . $amount . '_new_message_notification', $return, (int) $total_items, $text, $link, $item_id, $secondary_item_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This filter is documented in wp-includes/deprecated.php */
+ $retval = apply_filters_deprecated(
+ 'bp_messages_' . $amount . '_new_message_notification',
+ array( $retval, $total_items, $text, $link, $item_id, $secondary_item_id ),
+ '10.0.0',
+ 'bp_messages_' . $amount . '_new_message_' . $format . '_notification'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** This filter is documented in bp-messages/bp-messages-notifications.php */
- $return = apply_filters( 'bp_messages_' . $amount . '_new_message_notification', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => $text,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'link' => $link
- ), $link, (int) $total_items, $text, $link, $item_id, $secondary_item_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link' => $link,
+ );
+
+ /** This filter is documented in wp-includes/deprecated.php */
+ $retval = apply_filters_deprecated(
+ 'bp_messages_' . $amount . '_new_message_notification',
+ array(
+ $retval,
+ $link, // This extra `$link` variable is the reason why we deprecated the filter.
+ $total_items,
+ $text,
+ $link,
+ $item_id,
+ $secondary_item_id,
+ ),
+ '10.0.0',
+ 'bp_messages_' . $amount . '_new_message_' . $format . '_notification'
+ );
</ins><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">+ /**
+ * Filters the new message notification text before the notification is created.
+ *
+ * This is a dynamic filter. Possible filter names are:
+ * - 'bp_messages_multiple_new_message_string_notification'.
+ * - 'bp_messages_single_new_message_string_notification'.
+ * - 'bp_messages_multiple_new_message_array_notification'.
+ * - 'bp_messages_single_new_message_array_notification'.
+ *
+ * @param array|string $retval An array containing the text and the link of the Notification or simply its text.
+ * @param int $total_items Number of messages referred to by the notification.
+ * @param string $text The raw notification text (ie, not wrapped in a link).
+ * @param string $link The link of the notification.
+ * @param int $item_id ID of the associated item.
+ * @param int $secondary_item_id ID of the secondary associated item.
+ */
+ $retval = apply_filters(
+ 'bp_messages_' . $amount . '_new_message_' . $format . '_notification',
+ $retval,
+ $total_items,
+ $text,
+ $link,
+ $item_id,
+ $secondary_item_id
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Custom notification action for the Messages component
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'string' === $format ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return = $text;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval = $text;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text' => $text,
</span><span class="cx" style="display: block; padding: 0 10px"> 'link' => $link
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,13 +136,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( has_filter( 'bp_messages_single_new_message_notification' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'string' === $format ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** This filter is documented in bp-messages/bp-messages-notifications.php */
- $return = apply_filters( 'bp_messages_single_new_message_notification', $return, (int) $total_items, $text, $link, $item_id, $secondary_item_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This filter is documented in wp-includes/deprecated.php */
+ $retval = apply_filters_deprecated(
+ 'bp_messages_' . $amount . '_new_message_notification',
+ array( $retval, $total_items, $text, $link, $item_id, $secondary_item_id ),
+ '10.0.0',
+ "bp_messages_{$action}_notification"
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Notice that there are seven parameters instead of six? Ugh...
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** This filter is documented in bp-messages/bp-messages-notifications.php */
- $return = apply_filters( 'bp_messages_single_new_message_notification', $return, $link, (int) $total_items, $text, $link, $item_id, $secondary_item_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This filter is documented in wp-includes/deprecated.php */
+ $retval = apply_filters_deprecated(
+ 'bp_messages_' . $amount . '_new_message_notification',
+ array( $retval, $link, $total_items, $text, $link, $item_id, $secondary_item_id ),
+ '10.0.0',
+ "bp_messages_{$action}_notification"
+ );
</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">@@ -124,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $format Return value format. 'string' for BuddyBar-compatible
</span><span class="cx" style="display: block; padding: 0 10px"> * notifications; 'array' for WP Toolbar. Default: 'string'.
</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_{$action}_notification", $return, $item_id, $secondary_item_id, $total_items, $format );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval = apply_filters( "bp_messages_{$action}_notification", $retval, $item_id, $secondary_item_id, $total_items, $format );
</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">@@ -139,7 +184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'messages_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
</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 $return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $retval;
</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></pre></div>
<a id="trunktestsphpunittestcasesmessagesnotificationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/messages/notifications.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/messages/notifications.php 2021-08-09 10:00:02 UTC (rev 13034)
+++ trunk/tests/phpunit/testcases/messages/notifications.php 2021-08-10 16:16:30 UTC (rev 13035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,15 +31,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'component_action' => 'new_message',
</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">- add_filter( 'bp_messages_multiple_new_message_notification', array( $this, 'notification_filter_callback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'bp_messages_multiple_new_message_array_notification', array( $this, 'notification_filter_callback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = messages_format_notifications( 'new_message', $n, '', 2, 'array' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'bp_messages_multiple_new_message_notification', array( $this, 'notification_filter_callback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'bp_messages_multiple_new_message_array_notification', array( $this, 'notification_filter_callback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'bp_messages_multiple_new_message_notification', $this->filter_fired );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'bp_messages_multiple_new_message_array_notification', $this->filter_fired );
</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="cx" style="display: block; padding: 0 10px"> * @group messages_format_notifications
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group imath
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_friends_format_notifications_bp_messages_single_new_message_notification_nonstring_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Dummy thread ID
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,11 +56,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'component_action' => 'new_message',
</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">- add_filter( 'bp_messages_single_new_message_notification', array( $this, 'notification_filter_callback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'bp_messages_single_new_message_array_notification', array( $this, 'notification_filter_callback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = messages_format_notifications( 'new_message', $n, '', 1, 'array' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'bp_messages_single_new_message_notification', array( $this, 'notification_filter_callback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'bp_messages_single_new_message_array_notification', array( $this, 'notification_filter_callback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'bp_messages_single_new_message_notification', $this->filter_fired );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'bp_messages_single_new_message_array_notification', $this->filter_fired );
</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">@@ -79,11 +80,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'component_action' => 'new_message',
</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">- add_filter( 'bp_messages_multiple_new_message_notification', array( $this, 'notification_filter_callback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'bp_messages_multiple_new_message_string_notification', array( $this, 'notification_filter_callback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = messages_format_notifications( 'new_message', $n, '', 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'bp_messages_multiple_new_message_notification', array( $this, 'notification_filter_callback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'bp_messages_multiple_new_message_string_notification', array( $this, 'notification_filter_callback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'bp_messages_multiple_new_message_notification', $this->filter_fired );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'bp_messages_multiple_new_message_string_notification', $this->filter_fired );
</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">@@ -103,11 +104,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'component_action' => 'new_message',
</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">- add_filter( 'bp_messages_single_new_message_notification', array( $this, 'notification_filter_callback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'bp_messages_single_new_message_string_notification', array( $this, 'notification_filter_callback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = messages_format_notifications( 'new_message', $n, '', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'bp_messages_single_new_message_notification', array( $this, 'notification_filter_callback' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'bp_messages_single_new_message_string_notification', array( $this, 'notification_filter_callback' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'bp_messages_single_new_message_notification', $this->filter_fired );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'bp_messages_single_new_message_string_notification', $this->filter_fired );
</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></pre>
</div>
</div>
</body>
</html>