Changeset 8165

Timestamp:

03/26/2014 09:44:30 PM (10 years ago)

Author:

djpaul

Message:

xProfile: fix logic error in the BP_XProfile_ProfileData class' populate() method where the field's data wasn't being set correctly if it was already in cache.

File:

• trunk/bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)

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

@@ -1127 +1127 @@
         if ( false === $profiledata ) {
             $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
-
-            if ( $profiledata = $wpdb->get_row( $sql ) ) {
-                $this->id           = $profiledata->id;
-                $this->user_id      = $profiledata->user_id;
-                $this->field_id     = $profiledata->field_id;
-                $this->value        = stripslashes( $profiledata->value );
-                $this->last_updated = $profiledata->last_updated;
-
+            $profiledata = $wpdb->get_row( $sql );
+
+            if ( $profiledata ) {
                 wp_cache_set( $field_id, $profiledata, $cache_group );
-            } else {
-                // When no row is found, we'll need to set these properties manually
-                $this->field_id     = $field_id;
-                $this->user_id      = $user_id;
-            }
+            }
+        }
+
+        if ( $profiledata ) {
+            $this->id           = $profiledata->id;
+            $this->user_id      = $profiledata->user_id;
+            $this->field_id     = $profiledata->field_id;
+            $this->value        = stripslashes( $profiledata->value );
+            $this->last_updated = $profiledata->last_updated;
+
+        } else {
+            // When no row is found, we'll need to set these properties manually
+            $this->field_id     = $field_id;
+            $this->user_id      = $user_id;
         }
     }