Changeset 5796

Timestamp:

02/16/2012 01:40:18 PM (13 years ago)

Author:

boonebgorges

Message:

Swaps _user_meta() functions with BP equivalents. Fixes #4013. Props r-a-y

Location:

trunk

Files:

• bp-blogs/bp-blogs-functions.php (modified) (1 diff)
• bp-forums/bp-forums-bbpress-sa.php (modified) (2 diffs)
• bp-forums/bp-forums-functions.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-functions.php (modified) (6 diffs)

trunk/bp-blogs/bp-blogs-functions.php

@@ -317 +317 @@
         $key = $wpdb->get_blog_prefix( $blog_id ). 'capabilities';
 
-        $roles = get_user_meta( $user_id, $key, true );
+        $roles = bp_get_user_meta( $user_id, $key, true );
 
         if ( is_array( $roles ) )

trunk/bp-forums/bp-forums-bbpress-sa.php

@@ -102 +102 @@
         $site_admins = get_site_option( 'site_admins', array('admin') );
         foreach ( (array) $site_admins as $site_admin )
-            update_user_meta( bp_core_get_userid( $site_admin ), $bb_table_prefix . 'capabilities', array( 'keymaster' => true ) );
+            bp_update_user_meta( bp_core_get_userid( $site_admin ), $bb_table_prefix . 'capabilities', array( 'keymaster' => true ) );
 
         // Create the first forum.
@@ -129 +129 @@
         extract( $args, EXTR_SKIP );
 
-        return update_user_meta( $id, $meta_key, $meta_value );
+        return bp_update_user_meta( $id, $meta_key, $meta_value );
     }
 }

trunk/bp-forums/bp-forums-functions.php

@@ -611 +611 @@
         return $allcaps;
 
-    $bb_cap = get_user_meta( bp_loggedin_user_id(), $bb_table_prefix . 'capabilities', true );
+    $bb_cap = bp_get_user_meta( bp_loggedin_user_id(), $bb_table_prefix . 'capabilities', true );
 
     if ( empty( $bb_cap ) )

trunk/bp-members/bp-members-functions.php

@@ -1074 +1074 @@
     // Add the user's fullname to Xprofile
     if ( bp_is_active( 'xprofile' ) ) {
-        $firstname = get_user_meta( $user_id, 'first_name', true );
-        $lastname = ' ' . get_user_meta( $user_id, 'last_name', true );
+        $firstname = bp_get_user_meta( $user_id, 'first_name', true );
+        $lastname = ' ' . bp_get_user_meta( $user_id, 'last_name', true );
         $name = $firstname . $lastname;
 
         if ( empty( $name ) || ' ' == $name )
-            $name = get_user_meta( $user_id, 'nickname', true );
+            $name = bp_get_user_meta( $user_id, 'nickname', true );
 
         xprofile_set_field_data( 1, $user_id, $name );

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

@@ -290 +290 @@
         
         // Get the user's visibility level preferences
-        $visibility_levels = get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
+        $visibility_levels = bp_get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
         
         foreach( (array)$fields as $key => $field ) {

trunk/bp-xprofile/bp-xprofile-functions.php

@@ -271 +271 @@
     
     // Stored in an array in usermeta
-    $current_visibility_levels = get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
+    $current_visibility_levels = bp_get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
     
     if ( !$current_visibility_levels ) {
@@ -279 +279 @@
     $current_visibility_levels[$field_id] = $visibility_level;
     
-    return update_user_meta( $user_id, 'bp_xprofile_visibility_levels', $current_visibility_levels );
+    return bp_update_user_meta( $user_id, 'bp_xprofile_visibility_levels', $current_visibility_levels );
 }
 
@@ -442 +442 @@
     }
 
-    update_user_meta( $user_id, 'nickname',   $fullname  );
-    update_user_meta( $user_id, 'first_name', $firstname );
-    update_user_meta( $user_id, 'last_name',  $lastname  );
+    bp_update_user_meta( $user_id, 'nickname',   $fullname  );
+    bp_update_user_meta( $user_id, 'first_name', $firstname );
+    bp_update_user_meta( $user_id, 'last_name',  $lastname  );
 
     $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $user_id ) );
@@ -476 +476 @@
  * @package BuddyPress XProfile
  * @param $user_id The ID of the deleted user
- * @uses get_user_meta() Get a user meta value based on meta key from wp_usermeta
- * @uses delete_user_meta() Delete user meta value based on meta key from wp_usermeta
+ * @uses bp_get_user_meta() Get a user meta value based on meta key from wp_usermeta
+ * @uses bp_delete_user_meta() Delete user meta value based on meta key from wp_usermeta
  * @uses delete_data_for_user() Removes all profile data from the xprofile tables for the user
  */
@@ -484 +484 @@
 
     // delete any avatar files.
-    @unlink( get_user_meta( $user_id, 'bp_core_avatar_v1_path', true ) );
-    @unlink( get_user_meta( $user_id, 'bp_core_avatar_v2_path', true ) );
+    @unlink( bp_get_user_meta( $user_id, 'bp_core_avatar_v1_path', true ) );
+    @unlink( bp_get_user_meta( $user_id, 'bp_core_avatar_v2_path', true ) );
 
     // unset the usermeta for avatars from the usermeta table.
-    delete_user_meta( $user_id, 'bp_core_avatar_v1'      );
-    delete_user_meta( $user_id, 'bp_core_avatar_v1_path' );
-    delete_user_meta( $user_id, 'bp_core_avatar_v2'      );
-    delete_user_meta( $user_id, 'bp_core_avatar_v2_path' );
+    bp_delete_user_meta( $user_id, 'bp_core_avatar_v1'      );
+    bp_delete_user_meta( $user_id, 'bp_core_avatar_v1_path' );
+    bp_delete_user_meta( $user_id, 'bp_core_avatar_v2'      );
+    bp_delete_user_meta( $user_id, 'bp_core_avatar_v2_path' );
 }
 add_action( 'wpmu_delete_user',  'xprofile_remove_data' );
@@ -721 +721 @@
     }
     
-    $user_visibility_levels = get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
+    $user_visibility_levels = bp_get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
     
     $field_ids = array();