Changeset 3903 for trunk/bp-friends/bp-friends-classes.php

Timestamp:

01/24/2011 01:17:29 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Full by-ref audit of all components. Sacrifice E_DEPRECATED notices in PHP 5.3 for PHP4.x compatibility.

See r3893, r3892, r3891, r3873, r3871, r3867, r3865, r3864, r3863, r3854.

File:

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

trunk/bp-friends/bp-friends-classes.php

@@ -29 +29 @@
         if ( $friendship = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->friends->table_name} WHERE id = %d", $this->id ) ) ) {
             $this->initiator_user_id = $friendship->initiator_user_id;
-            $this->friend_user_id = $friendship->friend_user_id;
-            $this->is_confirmed = $friendship->is_confirmed;
-            $this->is_limited = $friendship->is_limited;
-            $this->date_created = $friendship->date_created;
+            $this->friend_user_id    = $friendship->friend_user_id;
+            $this->is_confirmed      = $friendship->is_confirmed;
+            $this->is_limited        = $friendship->is_limited;
+            $this->date_created      = $friendship->date_created;
         }
 
@@ -52 +52 @@
 
         $this->initiator_user_id = apply_filters( 'friends_friendship_initiator_user_id_before_save', $this->initiator_user_id, $this->id );
-        $this->friend_user_id = apply_filters( 'friends_friendship_friend_user_id_before_save', $this->friend_user_id, $this->id );
-        $this->is_confirmed = apply_filters( 'friends_friendship_is_confirmed_before_save', $this->is_confirmed, $this->id );
-        $this->is_limited = apply_filters( 'friends_friendship_is_limited_before_save', $this->is_limited, $this->id );
-        $this->date_created = apply_filters( 'friends_friendship_date_created_before_save', $this->date_created, $this->id );
-
-        do_action( 'friends_friendship_before_save', $this );
+        $this->friend_user_id    = apply_filters( 'friends_friendship_friend_user_id_before_save',    $this->friend_user_id,    $this->id );
+        $this->is_confirmed      = apply_filters( 'friends_friendship_is_confirmed_before_save',      $this->is_confirmed,      $this->id );
+        $this->is_limited        = apply_filters( 'friends_friendship_is_limited_before_save',        $this->is_limited,        $this->id );
+        $this->date_created      = apply_filters( 'friends_friendship_date_created_before_save',      $this->date_created,      $this->id );
+
+        do_action_ref_array( 'friends_friendship_before_save', array( &$this ) );
 
         if ( $this->id ) {
@@ -68 +68 @@
         }
 
-        do_action( 'friends_friendship_after_save', $this );
+        do_action( 'friends_friendship_after_save', array( &$this ) );
 
         return $result;