Changeset 9153

Timestamp:

11/18/2014 01:04:38 PM (10 years ago)

Author:

boonebgorges

Message:

Assemble the filters in friends_format_notifications() dynamically.

This makes them easier to document.

Props tw2113.
See #5970.

Location:

trunk

Files:

• src/bp-friends/bp-friends-notifications.php (modified) (3 diffs)
• tests/phpunit/testcases/friends/notifications.php (added)

trunk/src/bp-friends/bp-friends-notifications.php

@@ -137 +137 @@
             $link = trailingslashit( bp_loggedin_user_domain() . bp_get_friends_slug() . '/my-friends' );
 
+            // $action and $amount are used to generate dynamic filter names.
+            $action = 'accepted';
+
             // Set up the string and the filter
             if ( (int) $total_items > 1 ) {
                 $text = sprintf( __( '%d friends accepted your friendship requests', 'buddypress' ), (int) $total_items );
-                $filter = 'bp_friends_multiple_friendship_accepted_notification';
+                $amount = 'multiple';
             } else {
                 $text = sprintf( __( '%s accepted your friendship request', 'buddypress' ),  bp_core_get_user_displayname( $item_id ) );
-                $filter = 'bp_friends_single_friendship_accepted_notification';
+                $amount = 'single';
             }
 
@@ -150 +153 @@
         case 'friendship_request':
             $link = bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/?new';
+
+            $action = 'request';
 
             // Set up the string and the filter
             if ( (int) $total_items > 1 ) {
                 $text = sprintf( __( 'You have %d pending friendship requests', 'buddypress' ), (int) $total_items );
-                $filter = 'bp_friends_multiple_friendship_request_notification';
+                $amount = 'multiple';
             } else {
                 $text = sprintf( __( 'You have a friendship request from %s', 'buddypress' ),  bp_core_get_user_displayname( $item_id ) );
-                $filter = 'bp_friends_single_friendship_request_notification';
+                $amount = 'single';
             }
 
@@ -165 +170 @@
     // Return either an HTML link or an array, depending on the requested format
     if ( 'string' == $format ) {
-        $return = apply_filters( $filter, '<a href="' . esc_url( $link ) . '">' . esc_html( $text ) . '</a>', (int) $total_items, $item_id );
+        $return = apply_filters( 'bp_friends_' . $amount . '_friendship_' . $action . '_notification', '<a href="' . esc_url( $link ) . '">' . esc_html( $text ) . '</a>', (int) $total_items, $item_id );
     } else {
-        $return = apply_filters( $filter, array(
+        $return = apply_filters( 'bp_friends_' . $amount . '_friendship_' . $action . '_notification', array(
             'link' => $link,
             'text' => $text