Changeset 9677

Timestamp:

04/01/2015 11:56:35 PM (9 years ago)

Author:

johnjamesjacoby

Message:

XProfile: Improvements to BP_XProfile_Group

• Use self::get() in populate() to inherit caching goodness
• Improve failure detection in save() method, also checking for empty $wpdb->query()

File:

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

trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php

@@ -80 +80 @@
      */
     public function populate( $id ) {
-        global $wpdb;
-
-        $group = wp_cache_get( $id, 'bp_xprofile_groups' );
-
-        if ( false === $group ) {
-            $bp    = buddypress();
-            $group = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id ) );
-            wp_cache_set( $id, $group, 'bp_xprofile_groups' );
-        }
-
+
+        // Get this group
+        $group = self::get( array(
+            'profile_group_id' => $id
+        ) );
+
+        // Bail if group not found
         if ( empty( $group ) ) {
             return false;
         }
 
+        // Get the first array element
+        $group = reset( $group );
+
+        // Set object properties
         $this->id          = $group->id;
         $this->name        = $group->name;
@@ -129 +130 @@
         $bp = buddypress();
 
+        // Update or insert
         if ( ! empty( $this->id ) ) {
             $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET name = %s, description = %s WHERE id = %d", $this->name, $this->description, $this->id );
@@ -135 +137 @@
         }
 
+        // Attempt to insert or update
+        $query = $wpdb->query( $sql );
+
         // Bail if query fails
-        if ( is_wp_error( $wpdb->query( $sql ) ) ) {
+        if ( empty( $query ) || is_wp_error( $query ) ) {
             return false;
         }