<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][3753] trunk/bp-activity.php: Audit bp-activity.php - Sweep through existing functions and document them.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>3753</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-20 05:44:22 +0000 (Thu, 20 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Audit bp-activity.php - Sweep through existing functions and document them. Add missing error checks. Cast arguments correctly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (3752 => 3753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2011-01-20 04:30:24 UTC (rev 3752)
+++ trunk/bp-activity.php 2011-01-20 05:44:22 UTC (rev 3753)
</span><span class="lines">@@ -1,9 +1,20 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><ins>+/**
+ * BuddyPress Activity Streams
+ *
+ * An activity stream component, for users, groups, and blog tracking.
+ *
+ * @package BuddyPress
+ * @subpackage Activity Core
+ */
+
</ins><span class="cx"> class BP_Activity_Component extends BP_Component {
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Start the activity component creation process
</span><ins>+ *
+ * @since BuddyPress {unknown}
</ins><span class="cx"> */
</span><span class="cx"> function BP_Activity_Component() {
</span><span class="cx"> parent::start( 'activity', __( 'Activity Streams', 'buddypress' ) );
</span><span class="lines">@@ -12,6 +23,10 @@
</span><span class="cx"> /**
</span><span class="cx"> * Setup globals
</span><span class="cx"> *
</span><ins>+ * The BP_ACTIVITY_SLUG constant is deprecated, and only used here for
+ * backwards compatibility.
+ *
+ * @since BuddyPress {unknown}
</ins><span class="cx"> * @global obj $bp
</span><span class="cx"> */
</span><span class="cx"> function _setup_globals() {
</span><span class="lines">@@ -36,12 +51,12 @@
</span><span class="cx"> * @global obj $bp
</span><span class="cx"> */
</span><span class="cx"> function _includes() {
</span><del>- require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-actions.php' );
- require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-filters.php' );
- require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-screens.php' );
- require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-classes.php' );
- require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-functions.php' );
- require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-template.php' );
</del><ins>+ require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-actions.php' );
+ require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-filters.php' );
+ require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-screens.php' );
+ require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-classes.php' );
+ require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-template.php' );
+ require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-functions.php' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -247,21 +262,43 @@
</span><span class="cx">
</span><span class="cx"> /** Actions *******************************************************************/
</span><span class="cx">
</span><ins>+/**
+ * Sets the current action for a given activity stream location
+ *
+ * @global obj $bp
+ * @param str $component_id
+ * @param str $key
+ * @param str $value
+ * @return bool False on error, True on success
+ */
</ins><span class="cx"> function bp_activity_set_action( $component_id, $key, $value ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Return false if any of the above values are not set
</ins><span class="cx"> if ( empty( $component_id ) || empty( $key ) || empty( $value ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // Set activity action
</ins><span class="cx"> $bp->activity->actions->{$component_id}->{$key} = apply_filters( 'bp_activity_set_action', array(
</span><span class="cx"> 'key' => $key,
</span><span class="cx"> 'value' => $value
</span><span class="cx"> ), $component_id, $key, $value );
</span><ins>+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Retreives the current action from a component and key
+ *
+ * @global obj $bp
+ * @param str $component_id
+ * @param str $key
+ * @return mixed False on error, action on success
+ */
</ins><span class="cx"> function bp_activity_get_action( $component_id, $key ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Return false if any of the above values are not set
</ins><span class="cx"> if ( empty( $component_id ) || empty( $key ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -270,10 +307,24 @@
</span><span class="cx">
</span><span class="cx"> /** Favorites *****************************************************************/
</span><span class="cx">
</span><del>-function bp_activity_get_user_favorites( $user_id ) {
- $my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) );
- $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs ) );
</del><ins>+/**
+ * Get a users favorite activity stream items
+ *
+ * @global obj $bp
+ * @param int $user_id
+ * @return array Array of users favorite activity stream ID's
+ */
+function bp_activity_get_user_favorites( $user_id = 0 ) {
+ global $bp;
</ins><span class="cx">
</span><ins>+ // Fallback to logged in user if no user_id is passed
+ if ( empty( $user_id ) )
+ $user_id = $bp->displayed_user->id;
+
+ // Get favorites for user
+ $favs = get_user_meta( $user_id, 'bp_favorite_activities', true );
+ $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $favs ) );
+
</ins><span class="cx"> foreach( (array)$existing_favs['activities'] as $fav )
</span><span class="cx"> $new_favs[] = $fav->id;
</span><span class="cx">
</span><span class="lines">@@ -283,71 +334,133 @@
</span><span class="cx"> return apply_filters( 'bp_activity_get_user_favorites', $new_favs );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_activity_add_user_favorite( $activity_id, $user_id = false ) {
</del><ins>+/**
+ * Add an activity stream item as a favorite for a user
+ *
+ * @global obj $bp
+ * @param int $activity_id
+ * @param int $user_id
+ * @return bool
+ */
+function bp_activity_add_user_favorite( $activity_id, $user_id = 0 ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !$user_id )
</del><ins>+ // Favorite activity stream items are for logged in users only
+ if ( !is_user_logged_in() )
+ return false;
+
+ // Fallback to logged in user if no user_id is passed
+ if ( empty( $user_id ) )
</ins><span class="cx"> $user_id = $bp->loggedin_user->id;
</span><span class="cx">
</span><span class="cx"> // Update the user's personal favorites
</span><del>- $my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true ) );
</del><ins>+ $my_favs = get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true );
</ins><span class="cx"> $my_favs[] = $activity_id;
</span><span class="cx">
</span><span class="cx"> // Update the total number of users who have favorited this activity
</span><span class="cx"> $fav_count = bp_activity_get_meta( $activity_id, 'favorite_count' );
</span><ins>+ $fav_count = !empty( $fav_count ) ? (int)$fav_count + 1 : 1;
</ins><span class="cx">
</span><del>- if ( !empty( $fav_count ) )
- $fav_count = (int)$fav_count + 1;
- else
- $fav_count = 1;
-
</del><ins>+ // Update user meta
</ins><span class="cx"> update_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs );
</span><del>- bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count );
</del><span class="cx">
</span><del>- do_action( 'bp_activity_add_user_favorite', $activity_id, $user_id );
</del><ins>+ // Update activity meta counts
+ if ( true === bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count ) ) {
</ins><span class="cx">
</span><del>- return true;
</del><ins>+ // Execute additional code
+ do_action( 'bp_activity_add_user_favorite', $activity_id, $user_id );
+
+ // Success
+ return true;
+
+ // Saving meta was unsuccessful for an unknown reason
+ } else {
+ // Execute additional code
+ do_action( 'bp_activity_add_user_favorite_fail', $activity_id, $user_id );
+
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_activity_remove_user_favorite( $activity_id, $user_id = false ) {
</del><ins>+function bp_activity_remove_user_favorite( $activity_id, $user_id = 0 ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !$user_id )
</del><ins>+ // Favorite activity stream items are for logged in users only
+ if ( !is_user_logged_in() )
+ return false;
+
+ // Fallback to logged in user if no user_id is passed
+ if ( empty( $user_id ) )
</ins><span class="cx"> $user_id = $bp->loggedin_user->id;
</span><span class="cx">
</span><span class="cx"> // Remove the fav from the user's favs
</span><del>- $my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) );
</del><ins>+ $my_favs = get_user_meta( $user_id, 'bp_favorite_activities', true );
</ins><span class="cx"> $my_favs = array_flip( (array) $my_favs );
</span><span class="cx"> unset( $my_favs[$activity_id] );
</span><span class="cx"> $my_favs = array_unique( array_flip( $my_favs ) );
</span><span class="cx">
</span><span class="cx"> // Update the total number of users who have favorited this activity
</span><del>- $fav_count = bp_activity_get_meta( $activity_id, 'favorite_count' );
</del><ins>+ if ( $fav_count = bp_activity_get_meta( $activity_id, 'favorite_count' ) ) {
</ins><span class="cx">
</span><del>- if ( !empty( $fav_count ) ) {
- $fav_count = (int)$fav_count - 1;
- bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count );
- }
</del><ins>+ // Deduct from total favorites
+ if ( bp_activity_update_meta( $activity_id, 'favorite_count', (int)$fav_count - 1 ) ) {
</ins><span class="cx">
</span><del>- update_user_meta( $user_id, 'bp_favorite_activities', $my_favs );
</del><ins>+ // Update users favorites
+ if ( update_user_meta( $user_id, 'bp_favorite_activities', $my_favs ) ) {
</ins><span class="cx">
</span><del>- do_action( 'bp_activity_remove_user_favorite', $activity_id, $user_id );
</del><ins>+ // Execute additional code
+ do_action( 'bp_activity_remove_user_favorite', $activity_id, $user_id );
</ins><span class="cx">
</span><del>- return true;
</del><ins>+ // Success
+ return true;
+
+ // Error updating
+ } else {
+ return false;
+ }
+
+ // Error updating favorite count
+ } else {
+ return false;
+ }
+
+ // Error getting favorite count
+ } else {
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Check if activity exists by scanning content
+ *
+ * @param str $content
+ * @return bool
+ */
</ins><span class="cx"> function bp_activity_check_exists_by_content( $content ) {
</span><span class="cx"> return apply_filters( 'bp_activity_check_exists_by_content', BP_Activity_Activity::check_exists_by_content( $content ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Retreive the last time activity was updated
+ *
+ * @return str
+ */
</ins><span class="cx"> function bp_activity_get_last_updated() {
</span><span class="cx"> return apply_filters( 'bp_activity_get_last_updated', BP_Activity_Activity::get_last_updated() );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_activity_total_favorites_for_user( $user_id = false ) {
</del><ins>+/**
+ * Retreive the number of favorite activity stream items a user has
+ *
+ * @global obj $bp
+ * @param int $user_id
+ * @return int
+ */
+function bp_activity_total_favorites_for_user( $user_id = 0 ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !$user_id )
</del><ins>+ // Fallback on displayed user, and then logged in user
+ if ( empty( $user_id ) )
</ins><span class="cx"> $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
</span><span class="cx">
</span><span class="cx"> return BP_Activity_Activity::total_favorite_count( $user_id );
</span><span class="lines">@@ -355,94 +468,172 @@
</span><span class="cx">
</span><span class="cx"> /** Meta **********************************************************************/
</span><span class="cx">
</span><del>-
-function bp_activity_delete_meta( $activity_id, $meta_key = false, $meta_value = false ) {
</del><ins>+/**
+ * Delete a meta entry from the DB for an activity stream item
+ *
+ * @global DB $wpdb
+ * @global obj $bp
+ * @param int $activity_id
+ * @param str $meta_key
+ * @param str $meta_value
+ * @return bool
+ */
+function bp_activity_delete_meta( $activity_id, $meta_key = '', $meta_value = '' ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><ins>+ // Return false if any of the above values are not set
</ins><span class="cx"> if ( !is_numeric( $activity_id ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // Sanitize key
</ins><span class="cx"> $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
</span><span class="cx">
</span><span class="cx"> if ( is_array( $meta_value ) || is_object( $meta_value ) )
</span><span class="cx"> $meta_value = serialize( $meta_value );
</span><span class="cx">
</span><ins>+ // Trim off whitespace
</ins><span class="cx"> $meta_value = trim( $meta_value );
</span><span class="cx">
</span><del>- if ( !$meta_key )
- $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id = %d", $activity_id ) );
</del><ins>+ // Delete all for activity_id
+ if ( empty( $meta_key ) )
+ $retval = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id = %d", $activity_id ) );
+
+ // Delete only when all match
</ins><span class="cx"> else if ( $meta_value )
</span><del>- $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id = %d AND meta_key = %s AND meta_value = %s", $activity_id, $meta_key, $meta_value ) );
</del><ins>+ $retval = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id = %d AND meta_key = %s AND meta_value = %s", $activity_id, $meta_key, $meta_value ) );
+
+ // Delete only when activity_id and meta_key match
</ins><span class="cx"> else
</span><del>- $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id = %d AND meta_key = %s", $activity_id, $meta_key ) );
</del><ins>+ $retval = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id = %d AND meta_key = %s", $activity_id, $meta_key ) );
</ins><span class="cx">
</span><ins>+ // Delete cache entry
</ins><span class="cx"> wp_cache_delete( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, 'bp' );
</span><span class="cx">
</span><del>- return true;
</del><ins>+ // Success
+ if ( !is_wp_error( $retval ) )
+ return true;
+
+ // Fail
+ else
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_activity_get_meta( $activity_id, $meta_key = '' ) {
</del><ins>+/**
+ * Get activity meta
+ *
+ * @global DB $wpdb
+ * @global obj $bp
+ * @param int $activity_id
+ * @param str $meta_key
+ * @return bool
+ */
+function bp_activity_get_meta( $activity_id = 0, $meta_key = '' ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $activity_id = (int)$activity_id;
-
- if ( !$activity_id )
</del><ins>+ // Make sure activity_id is valid
+ if ( empty( $activity_id ) || !is_numeric( $activity_id ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( !empty($meta_key) ) {
</del><ins>+ // We have a key to look for
+ if ( !empty( $meta_key ) ) {
+
+ // Sanitize key
</ins><span class="cx"> $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
</span><span class="cx">
</span><ins>+ // Check cache
</ins><span class="cx"> if ( !$metas = wp_cache_get( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, 'bp' ) ) {
</span><ins>+
+ // No cache so hit the DB
</ins><span class="cx"> $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM {$bp->activity->table_name_meta} WHERE activity_id = %d AND meta_key = %s", $activity_id, $meta_key ) );
</span><ins>+
+ // Set cache
</ins><span class="cx"> wp_cache_set( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, $metas, 'bp' );
</span><span class="cx"> }
</span><del>- } else
</del><ins>+
+ // No key so get all for activity_id
+ } else {
</ins><span class="cx"> $metas = $wpdb->get_col( $wpdb->prepare( "SELECT meta_value FROM {$bp->activity->table_name_meta} WHERE activity_id = %d", $activity_id ) );
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( empty($metas) )
</del><ins>+ // No result so return false
+ if ( empty( $metas ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // Maybe, just maybe... unserialize
</ins><span class="cx"> $metas = array_map( 'maybe_unserialize', (array)$metas );
</span><span class="cx">
</span><del>- if ( 1 == count($metas) )
- return $metas[0];
- else
- return $metas;
</del><ins>+ // Return first item in array if only 1, else return all metas found
+ $retval = ( 1 == count( $metas ) ? $metas[0] : $metas );
+
+ // Filter result before returning
+ return apply_filters( 'bp_activity_get_meta', $retval, $activity_id, $meta_key );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Update activity meta
+ *
+ * @global DB $wpdb
+ * @global obj $bp
+ * @param int $activity_id
+ * @param str $meta_key
+ * @param str $meta_value
+ * @return bool
+ */
</ins><span class="cx"> function bp_activity_update_meta( $activity_id, $meta_key, $meta_value ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><ins>+ // Make sure activity_id is valid
</ins><span class="cx"> if ( !is_numeric( $activity_id ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // Sanitize key
</ins><span class="cx"> $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
</span><span class="cx">
</span><ins>+ // Sanitize value
</ins><span class="cx"> if ( is_string( $meta_value ) )
</span><span class="cx"> $meta_value = stripslashes( $wpdb->escape( $meta_value ) );
</span><span class="cx">
</span><ins>+ // Maybe, just maybe... serialize
</ins><span class="cx"> $meta_value = maybe_serialize( $meta_value );
</span><span class="cx">
</span><ins>+ // If value is empty, delete the meta key
</ins><span class="cx"> if ( empty( $meta_value ) )
</span><span class="cx"> return bp_activity_delete_meta( $activity_id, $meta_key );
</span><span class="cx">
</span><ins>+ // See if meta key exists for activity_id
</ins><span class="cx"> $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name_meta} WHERE activity_id = %d AND meta_key = %s", $activity_id, $meta_key ) );
</span><span class="cx">
</span><del>- if ( !$cur )
</del><ins>+ // Meta key does not exist so INSERT
+ if ( empty( $cur ) )
</ins><span class="cx"> $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->activity->table_name_meta} ( activity_id, meta_key, meta_value ) VALUES ( %d, %s, %s )", $activity_id, $meta_key, $meta_value ) );
</span><ins>+
+ // Meta key exists, so UPDATE
</ins><span class="cx"> else if ( $cur->meta_value != $meta_value )
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name_meta} SET meta_value = %s WHERE activity_id = %d AND meta_key = %s", $meta_value, $activity_id, $meta_key ) );
</span><ins>+
+ // Weirdness, so return false
</ins><span class="cx"> else
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // Set cache
</ins><span class="cx"> wp_cache_set( 'bp_activity_meta_' . $meta_key . '_' . $activity_id, $meta_value, 'bp' );
</span><span class="cx">
</span><ins>+ // Victory is ours!
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Clean up ******************************************************************/
</span><span class="cx">
</span><del>-function bp_activity_remove_data( $user_id ) {
</del><ins>+/**
+ * Completely remove
+ * @param int $user_id
+ */
+function bp_activity_remove_all_user_data( $user_id = 0 ) {
+
+ // Do not delete user data unless a logged in user says so
+ if ( empty( $user_id ) || !is_user_logged_in() )
+ return false;
+
</ins><span class="cx"> // Clear the user's activity from the sitewide stream and clear their activity tables
</span><span class="cx"> bp_activity_delete( array( 'user_id' => $user_id ) );
</span><span class="cx">
</span><span class="lines">@@ -450,16 +641,20 @@
</span><span class="cx"> delete_user_meta( $user_id, 'bp_latest_update' );
</span><span class="cx"> delete_user_meta( $user_id, 'bp_favorite_activities' );
</span><span class="cx">
</span><del>- do_action( 'bp_activity_remove_data', $user_id );
</del><ins>+ // Execute additional code
+ do_action( 'bp_activity_remove_data', $user_id ); // Deprecated! Do not use!
+
+ // Use this going forward
+ do_action( 'bp_activity_remove_all_user_data', $user_id );
</ins><span class="cx"> }
</span><del>-add_action( 'wpmu_delete_user', 'bp_activity_remove_data' );
-add_action( 'delete_user', 'bp_activity_remove_data' );
-add_action( 'bp_make_spam_user', 'bp_activity_remove_data' );
</del><ins>+add_action( 'wpmu_delete_user', 'bp_activity_remove_all_user_data' );
+add_action( 'delete_user', 'bp_activity_remove_all_user_data' );
+add_action( 'bp_make_spam_user', 'bp_activity_remove_all_user_data' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Register the activity stream actions for updates
</span><span class="cx"> *
</span><del>- * @global array $bp
</del><ins>+ * @global obj $bp
</ins><span class="cx"> */
</span><span class="cx"> function updates_register_activity_actions() {
</span><span class="cx"> global $bp;
</span></span></pre>
</div>
</div>
</body>
</html>