Changeset 4622

Timestamp:

07/06/2011 08:02:44 PM (13 years ago)

Author:

boonebgorges

Message:

Introduces bp_get_messages_slug() and bp_messages_slug() template tags. Ports Messages Component notification items to the WP Admin Bar. References #3294

Location:

trunk/bp-messages

Files:

• bp-messages-functions.php (modified) (1 diff)
• bp-messages-template.php (modified) (1 diff)

trunk/bp-messages/bp-messages-functions.php

@@ -212 +212 @@
  */
 
-function messages_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
+/**
+ * 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' ) {
     global $bp;
 
     if ( 'new_message' == $action ) {
-        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 );
+        $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';
+        }
+    }
+
+    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 );
     }
 
     do_action( 'messages_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
 
-    return false;
+    return $return;
 }
 ?>

trunk/bp-messages/bp-messages-template.php

@@ -496 +496 @@
     }
 
+/**
+ * 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 );
+    }
+
 function bp_message_get_notices() {
     global $userdata;