Changeset 5391

Timestamp:

11/27/2011 04:52:05 PM (15 years ago)

Author:

boonebgorges

Message:

Cleanup pass-by-reference and whitespace in bp-xprofile-classes.php. Fixes #3723

File:

• trunk/bp-xprofile/bp-xprofile-classes.php (modified) (9 diffs)

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -41 +41 @@
                 global $wpdb, $bp;
 
-                $this->name                     = apply_filters( 'xprofile_group_name_before_save',        $this->name,        $this->id );
-                $this->description      = apply_filters( 'xprofile_group_description_before_save', $this->description, $this->id );
-
-                do_action_ref_array( 'xprofile_group_before_save', array( &$this ) );
+                $this->name        = apply_filters( 'xprofile_group_name_before_save',        $this->name,        $this->id );
+                $this->description = apply_filters( 'xprofile_group_description_before_save', $this->description, $this->id );
+
+                do_action_ref_array( 'xprofile_group_before_save', array( $this ) );
 
                 if ( $this->id )
@@ -54 +54 @@
                         return false;
 
-                do_action_ref_array( 'xprofile_group_after_save', array( &$this ) );
+                do_action_ref_array( 'xprofile_group_after_save', array( $this ) );
 
                 if ( $this->id )
@@ -398 +398 @@
                 $error = false;
 
-                $this->group_id         = apply_filters( 'xprofile_field_group_id_before_save',    $this->group_id,    $this->id );
-                $this->parent_id        = apply_filters( 'xprofile_field_parent_id_before_save',   $this->parent_id,   $this->id );
-                $this->type                     = apply_filters( 'xprofile_field_type_before_save',        $this->type,        $this->id );
-                $this->name                     = apply_filters( 'xprofile_field_name_before_save',        $this->name,        $this->id );
-                $this->description      = apply_filters( 'xprofile_field_description_before_save', $this->description, $this->id );
-                $this->is_required      = apply_filters( 'xprofile_field_is_required_before_save', $this->is_required, $this->id );
-                $this->order_by         = apply_filters( 'xprofile_field_order_by_before_save',    $this->order_by,    $this->id );
-                $this->field_order      = apply_filters( 'xprofile_field_field_order_before_save', $this->field_order, $this->id );
-
-                do_action_ref_array( 'xprofile_field_before_save', array( &$this ) );
+                $this->group_id    = apply_filters( 'xprofile_field_group_id_before_save',    $this->group_id,    $this->id );
+                $this->parent_id   = apply_filters( 'xprofile_field_parent_id_before_save',   $this->parent_id,   $this->id );
+                $this->type        = apply_filters( 'xprofile_field_type_before_save',        $this->type,        $this->id );
+                $this->name        = apply_filters( 'xprofile_field_name_before_save',        $this->name,        $this->id );
+                $this->description = apply_filters( 'xprofile_field_description_before_save', $this->description, $this->id );
+                $this->is_required = apply_filters( 'xprofile_field_is_required_before_save', $this->is_required, $this->id );
+                $this->order_by    = apply_filters( 'xprofile_field_order_by_before_save',    $this->order_by,    $this->id );
+                $this->field_order = apply_filters( 'xprofile_field_field_order_before_save', $this->field_order, $this->id );
+
+                do_action_ref_array( 'xprofile_field_before_save', array( $this ) );
 
                 if ( $this->id != null )
@@ -497 +497 @@
                         }
 
-                        do_action_ref_array( 'xprofile_field_after_save', array( &$this ) );
+                        do_action_ref_array( 'xprofile_field_after_save', array( $this ) );
 
                         return $field_id;
@@ -749 +749 @@
                                 </div>
 
-                                <?php do_action_ref_array( 'xprofile_field_additional_options', array( &$this ) ); ?>
+                                <?php do_action_ref_array( 'xprofile_field_additional_options', array( $this ) ); ?>
 
                                 <?php $this->render_admin_form_children(); ?>
@@ -846 +846 @@
                 $retval = $wpdb->get_row( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_data} WHERE user_id = %d AND field_id = %d", $this->user_id, $this->field_id ) );
 
-                return apply_filters_ref_array( 'xprofile_data_exists', array( (bool)$retval, &$this ) );
+                return apply_filters_ref_array( 'xprofile_data_exists', array( (bool)$retval, $this ) );
         }
 
@@ -863 +863 @@
                 $retval = $wpdb->get_row( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE id = %d", $this->field_id ) );
 
-                return apply_filters_ref_array( 'xprofile_data_is_valid_field', array( (bool)$retval, &$this ) );
+                return apply_filters_ref_array( 'xprofile_data_is_valid_field', array( (bool)$retval, $this ) );
         }
 
@@ -874 +874 @@
                 $this->last_updated = apply_filters( 'xprofile_data_last_updated_before_save', bp_core_current_time(), $this->id );
 
-                do_action_ref_array( 'xprofile_data_before_save', array( &$this ) );
+                do_action_ref_array( 'xprofile_data_before_save', array( $this ) );
 
                 if ( $this->is_valid_field() ) {
@@ -892 +892 @@
                                 return false;
 
-                        do_action_ref_array( 'xprofile_data_after_save', array( &$this ) );
+                        do_action_ref_array( 'xprofile_data_after_save', array( $this ) );
 
                         return true;