Changeset 4558 for trunk/bp-activity/bp-activity-functions.php

Timestamp:

06/24/2011 06:52:57 PM (13 years ago)

Author:

boonebgorges

Message:

Introduces bp_x_user_meta() wrapper functions. Refactors internal user_meta calls to use the new functions. Fixes #3299

File:

• trunk/bp-activity/bp-activity-functions.php (modified) (11 diffs)

trunk/bp-activity/bp-activity-functions.php

@@ -39 +39 @@
  */
 function bp_activity_clear_new_mentions( $user_id ) {
-    delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ) );
-    delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mentions' ) );
+    bp_delete_user_meta( $user_id, 'bp_new_mention_count' );
+    bp_delete_user_meta( $user_id, 'bp_new_mentions' );
 }
 
@@ -65 +65 @@
 
             // Adjust the mention list and count for the member
-            $new_mention_count = (int)get_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ), true );
-            if ( !$new_mentions = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mentions' ), true ) )
+            $new_mention_count = (int)bp_get_user_meta( $user_id, 'bp_new_mention_count', true );
+            if ( !$new_mentions = bp_get_user_meta( $user_id, 'bp_new_mentions', true ) )
                 $new_mentions = array();
 
@@ -89 +89 @@
 
             // Resave the user_meta
-            update_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ), $new_mention_count );
-            update_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mentions' ), $new_mentions );
+            bp_update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count );
+            bp_update_user_meta( $user_id, 'bp_new_mentions', $new_mentions );
         }
     }
@@ -191 +191 @@
 
     // Get favorites for user
-    $favs = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_favorite_activities' ), true );
+    $favs = bp_get_user_meta( $user_id, 'bp_favorite_activities', true );
 
     return apply_filters( 'bp_activity_get_user_favorites', $favs );
@@ -216 +216 @@
 
     // Update the user's personal favorites
-    $my_favs   = get_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'bp_favorite_activities' ), true );
+    $my_favs   = bp_get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true );
     $my_favs[] = $activity_id;
 
@@ -224 +224 @@
 
     // Update user meta
-    update_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'bp_favorite_activities' ), $my_favs );
+    bp_update_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs );
 
     // Update activity meta counts
@@ -256 +256 @@
 
     // Remove the fav from the user's favs
-    $my_favs = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_favorite_activities' ), true );
+    $my_favs = bp_get_user_meta( $user_id, 'bp_favorite_activities', true );
     $my_favs = array_flip( (array) $my_favs );
     unset( $my_favs[$activity_id] );
@@ -268 +268 @@
 
             // Update users favorites
-            if ( update_user_meta( $user_id, bp_get_user_meta_key( 'bp_favorite_activities' ), $my_favs ) ) {
+            if ( bp_update_user_meta( $user_id, 'bp_favorite_activities', $my_favs ) ) {
 
                 // Execute additional code
@@ -500 +500 @@
 
     // Remove any usermeta
-    delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_latest_update' ) );
-    delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_favorite_activities' ) );
+    bp_delete_user_meta( $user_id, 'bp_latest_update' );
+    bp_delete_user_meta( $user_id, 'bp_favorite_activities' );
 
     // Execute additional code
@@ -676 +676 @@
 
     // Add this update to the "latest update" usermeta so it can be fetched anywhere.
-    update_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'bp_latest_update' ), array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
+    bp_update_user_meta( $bp->loggedin_user->id, 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
 
     // Require the notifications code so email notifications can be set on the 'bp_activity_posted_update' action.
@@ -808 +808 @@
     do_action( 'bp_before_activity_delete', $args );
 
-    $latest_update = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_latest_update' ), true );
+    $latest_update = bp_get_user_meta( $user_id, 'bp_latest_update', true );
     if ( !empty( $latest_update ) ) {
         if ( in_array( (int)$latest_update['id'], (array)$activity_ids_deleted ) )
-            delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_latest_update' ) );
+            bp_delete_user_meta( $user_id, 'bp_latest_update' );
     }