Ticket #2952: 2952.diff

bp-activity.php

@@ -742 +742 @@
         ) );
 
         /* Add this update to the "latest update" usermeta so it can be fetched anywhere. */
-        update_user_meta( $bp->loggedin_user->id, 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
+        update_user_meta( $bp->loggedin_user->id, $bp->user_latest_update_key, 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. */
         require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-notifications.php' );
@@ -869 +869 @@
         else
                 $user_id = $args['user_id'];
 
-        $latest_update = get_user_meta( $user_id, 'bp_latest_update', true );
+        $latest_update = get_user_meta( $user_id, $bp->user_latest_update_key, true );
         if ( !empty( $latest_update ) ) {
                 if ( in_array( (int)$latest_update['id'], (array)$activity_ids_deleted ) )
-                        delete_user_meta( $user_id, 'bp_latest_update' );
+                        delete_user_meta( $user_id, $bp->user_latest_update_key );
         }
 
         do_action( 'bp_activity_delete', $args );
@@ -1032 +1032 @@
 }
 
 function bp_activity_get_user_favorites( $user_id ) {
-        $my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) );
+        $my_favs = maybe_unserialize( get_user_meta( $user_id, $bp->user_favorite_activities_key, true ) );
         $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs ) );
 
         foreach( (array)$existing_favs['activities'] as $fav )
                 $new_favs[] = $fav->id;
 
         $new_favs = array_unique( (array)$new_favs );
-        update_user_meta( $user_id, 'bp_favorite_activities', $new_favs );
+        update_user_meta( $user_id, $bp->user_favorite_activities_key, $new_favs );
 
         return apply_filters( 'bp_activity_get_user_favorites', $new_favs );
 }
@@ -1051 +1051 @@
                 $user_id = $bp->loggedin_user->id;
 
         /* Update the user's personal favorites */
-        $my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true ) );
+        $my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, $bp->user_favorite_activities_key, true ) );
         $my_favs[] = $activity_id;
 
         /* Update the total number of users who have favorited this activity */
@@ -1062 +1062 @@
         else
                 $fav_count = 1;
 
-        update_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs );
+        update_user_meta( $bp->loggedin_user->id, $bp->user_favorite_activities_key, $my_favs );
         bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count );
 
         do_action( 'bp_activity_add_user_favorite', $activity_id, $user_id );
@@ -1077 +1077 @@
                 $user_id = $bp->loggedin_user->id;
 
         /* Remove the fav from the user's favs */
-        $my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) );
+        $my_favs = maybe_unserialize( get_user_meta( $user_id, $bp->user_favorite_activities_key, true ) );
         $my_favs = array_flip( (array) $my_favs );
         unset( $my_favs[$activity_id] );
         $my_favs = array_unique( array_flip( $my_favs ) );
@@ -1090 +1090 @@
                 bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count );
         }
 
-        update_user_meta( $user_id, 'bp_favorite_activities', $my_favs );
+        update_user_meta( $user_id, $bp->user_favorite_activities_key, $my_favs );
 
         do_action( 'bp_activity_remove_user_favorite', $activity_id, $user_id );
 
@@ -1212 +1212 @@
         bp_activity_delete( array( 'user_id' => $user_id ) );
 
         // Remove any usermeta
-        delete_user_meta( $user_id, 'bp_latest_update' );
-        delete_user_meta( $user_id, 'bp_favorite_activities' );
+        delete_user_meta( $user_id, $bp->user_latest_update_key );
+        delete_user_meta( $user_id, $bp->user_favorite_activities_key );
 
         do_action( 'bp_activity_remove_data', $user_id );
 }

bp-activity/bp-activity-templatetags.php

@@ -842 +842 @@
                 if ( !$user_id )
                         $user_id = $bp->displayed_user->id;
 
-                if ( !$update = get_user_meta( $user_id, 'bp_latest_update', true ) )
+                if ( !$update = get_user_meta( $user_id, $bp->user_latest_update_key, true ) )
                         return false;
 
                 $latest_update = '"' . apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], 40 ) ) ) ) . '"';

bp-core.php

@@ -73 +73 @@
 
         // Get the base database prefix
         $bp->table_prefix = bp_core_get_table_prefix();
+        $bp->user_latest_update_key = $bp->table_prefix . 'latest_update';
+        $bp->user_favorite_activities_key = $bp->table_prefix . 'favorite_activities';
 
         // The domain for the root of the site where the main blog resides
         $bp->root_domain = bp_core_get_root_domain();
@@ -2153 +2155 @@
 
         bp_core_update_page_meta( $page_ids );
 }
-?>
- No newline at end of file
+?>