Changeset 5712 for trunk/bp-friends/bp-friends-notifications.php

Timestamp:

02/11/2012 04:42:04 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Friends component. See #3989.

File:

• trunk/bp-friends/bp-friends-notifications.php (modified) (3 diffs)

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

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress Friends Activity Functions
+ *
+ * These functions handle the recording, deleting and formatting of activity
+ * for the user and for this specific component.
+ *
+ * @package BuddyPress
+ * @subpackage FriendsActivity
+ */
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 
 function friends_notification_new_request( $friendship_id, $initiator_id, $friend_id ) {
-        global $bp;
 
         $initiator_name = bp_core_get_user_displayname( $initiator_id );
@@ -11 +21 @@
                 return false;
 
-        $ud = get_userdata( $friend_id );
-        $initiator_ud = get_userdata( $initiator_id );
-
+        $ud                = get_userdata( $friend_id );
         $all_requests_link = bp_core_get_user_domain( $friend_id ) . bp_get_friends_slug() . '/requests/';
-        $settings_slug    = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
-        $settings_link    = trailingslashit( bp_core_get_user_domain( $friend_id ) .  $settings_slug . '/notifications' );
-        $initiator_link   = bp_core_get_user_domain( $initiator_id );
+        $settings_slug     = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+        $settings_link     = trailingslashit( bp_core_get_user_domain( $friend_id ) .  $settings_slug . '/notifications' );
+        $initiator_link    = bp_core_get_user_domain( $initiator_id );
 
         // Set up and send the message
@@ -47 +55 @@
 
 function friends_notification_accepted_request( $friendship_id, $initiator_id, $friend_id ) {
-        global $bp;
-
-        $friendship = new BP_Friends_Friendship( $friendship_id, false, false );
 
         $friend_name = bp_core_get_user_displayname( $friend_id );
 
-        if ( 'no' == bp_get_user_meta( (int)$initiator_id, 'notification_friends_friendship_accepted', true ) )
+        if ( 'no' == bp_get_user_meta( (int) $initiator_id, 'notification_friends_friendship_accepted', true ) )
                 return false;
 
-        $ud = get_userdata( $initiator_id );
-
+        $ud            = get_userdata( $initiator_id );
         $friend_link   = bp_core_get_user_domain( $friend_id );
         $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';