Changeset 3369 for trunk/bp-xprofile/bp-xprofile-classes.php

Timestamp:

11/07/2010 12:20:02 AM (16 years ago)

Author:

djpaul

Message:

Fixes even more WP_DEBUG warnings.

File:

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

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

@@ -94 +94 @@
         extract( $r, EXTR_SKIP );
 
+        $group_id_sql = '';
         if ( $profile_group_id )
             $group_id_sql = $wpdb->prepare( 'WHERE g.id = %d', $profile_group_id );
@@ -258 +259 @@
         global $wpdb, $userdata, $bp;
 
+        $user_id = 0;
         if ( is_null( $user_id ) )
             $user_id = $userdata->ID;
@@ -264 +266 @@
 
         if ( $field = $wpdb->get_row( $sql ) ) {
-            $this->id                   = $field->id;
-            $this->group_id             = $field->group_id;
-            $this->parent_id            = $field->parent_id;
-            $this->type                 = $field->type;
-            $this->name                 = stripslashes($field->name);
-            $this->description          = stripslashes($field->description);
-            $this->is_required          = $field->is_required;
-            $this->can_delete           = $field->can_delete;
-            $this->field_order          = $field->field_order;
-            $this->option_order         = $field->option_order;
-            $this->order_by             = $field->order_by;
-            $this->is_default_option    = $field->is_default_option;
-
-            if ( $get_data )
-                $this->data             = $this->get_field_data( $user_id );
-
+            $this->id               = $field->id;
+            $this->group_id          = $field->group_id;
+            $this->parent_id         = $field->parent_id;
+            $this->type              = $field->type;
+            $this->name              = stripslashes( $field->name );
+            $this->description       = stripslashes( $field->description );
+            $this->is_required       = $field->is_required;
+            $this->can_delete        = $field->can_delete;
+            $this->field_order       = $field->field_order;
+            $this->option_order      = $field->option_order;
+            $this->order_by          = $field->order_by;
+            $this->is_default_option = $field->is_default_option;
+
+            if ( $get_data && $user_id )
+                $this->data            = $this->get_field_data( $user_id );
         }
     }