<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2675] trunk:
Added missing pre_save filters to activity saving.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2675</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-11 14:50:47 +0000 (Thu, 11 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added missing pre_save filters to activity saving. Fixed bug where a user could leave/join a group quickly multiple times and flood the activity stream.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (2674 => 2675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2010-02-11 14:11:07 UTC (rev 2674)
+++ trunk/bp-activity/bp-activity-classes.php 2010-02-11 14:50:47 UTC (rev 2675)
</span><span class="lines">@@ -46,8 +46,22 @@
</span><span class="cx"> function save() {
</span><span class="cx"> global $wpdb, $bp, $current_user;
</span><span class="cx">
</span><del>- do_action( 'bp_activity_before_save', $this );
</del><ins>+ do_action( 'bp_activity_before_save', &$this );
</ins><span class="cx">
</span><ins>+ $this->id = apply_filters( 'bp_activity_id_before_save', $this->id, &$this );
+ $this->item_id = apply_filters( 'bp_activity_item_id_before_save', $this->item_id, &$this );
+ $this->secondary_item_id = apply_filters( 'bp_activity_secondary_item_id_before_save', $this->secondary_item_id, &$this );
+ $this->user_id = apply_filters( 'bp_activity_user_id_before_save', $this->user_id, &$this );
+ $this->primary_link = apply_filters( 'bp_activity_primary_link_before_save', $this->primary_link, &$this );
+ $this->component = apply_filters( 'bp_activity_component_before_save', $this->component, &$this );
+ $this->type = apply_filters( 'bp_activity_type_before_save', $this->type, &$this );
+ $this->action = apply_filters( 'bp_activity_action_before_save', $this->action, &$this );
+ $this->content = apply_filters( 'bp_activity_content_before_save', $this->content, &$this );
+ $this->date_recorded = apply_filters( 'bp_activity_date_recorded_before_save', $this->date_recorded, &$this );
+ $this->hide_sitewide = apply_filters( 'bp_activity_hide_sitewide_before_save', $this->hide_sitewide, &$this );
+ $this->mptt_left = apply_filters( 'bp_activity_mptt_left_before_save', $this->mptt_left, &$this );
+ $this->mptt_right = apply_filters( 'bp_activity_mptt_right_before_save', $this->mptt_right, &$this );
+
</ins><span class="cx"> if ( !$this->component || !$this->type )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -66,7 +80,7 @@
</span><span class="cx"> if ( empty( $this->id ) )
</span><span class="cx"> $this->id = $wpdb->insert_id;
</span><span class="cx">
</span><del>- do_action( 'bp_activity_after_save', $this );
</del><ins>+ do_action( 'bp_activity_after_save', &$this );
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -279,6 +293,8 @@
</span><span class="cx"> else
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ error_log( $where_sql );
+
</ins><span class="cx"> /* Fetch the activity IDs so we can delete any comments for this activity item */
</span><span class="cx"> $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-filters.php (2674 => 2675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2010-02-11 14:11:07 UTC (rev 2674)
+++ trunk/bp-activity/bp-activity-filters.php 2010-02-11 14:50:47 UTC (rev 2675)
</span><span class="lines">@@ -1,36 +1,54 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /* Apply WordPress defined filters */
</span><ins>+add_filter( 'bp_get_activity_action', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_get_activity_content_body', 'bp_activity_filter_kses', 1 );
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'bp_activity_filter_kses', 1 );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'bp_activity_filter_kses', 1 );
</span><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'bp_activity_filter_kses', 1 );
</span><ins>+add_filter( 'bp_activity_content_before_save', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_activity_action_before_save', 'bp_activity_filter_kses', 1 );
</ins><span class="cx">
</span><ins>+add_filter( 'bp_get_activity_action', 'force_balance_tags' );
+add_filter( 'bp_get_activity_content_body', 'force_balance_tags' );
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'force_balance_tags' );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'force_balance_tags' );
</span><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'force_balance_tags' );
</span><span class="cx">
</span><ins>+add_filter( 'bp_get_activity_action', 'wptexturize' );
+add_filter( 'bp_get_activity_content_body', 'wptexturize' );
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'wptexturize' );
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'wptexturize' );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'wptexturize' );
</span><span class="cx">
</span><ins>+add_filter( 'bp_get_activity_action', 'convert_smilies' );
+add_filter( 'bp_get_activity_content_body', 'convert_smilies' );
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'convert_smilies' );
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'convert_smilies' );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'convert_smilies' );
</span><span class="cx">
</span><ins>+add_filter( 'bp_get_activity_action', 'convert_chars' );
+add_filter( 'bp_get_activity_content_body', 'convert_chars' );
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'convert_chars' );
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'convert_chars' );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'convert_chars' );
</span><span class="cx">
</span><ins>+add_filter( 'bp_get_activity_action', 'wpautop' );
+add_filter( 'bp_get_activity_content_body', 'wpautop' );
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'wpautop' );
</span><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'wpautop' );
</span><span class="cx">
</span><ins>+add_filter( 'bp_get_activity_action', 'make_clickable' );
+add_filter( 'bp_get_activity_content_body', 'make_clickable' );
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'make_clickable' );
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'make_clickable' );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'make_clickable' );
</span><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'make_clickable' );
</span><span class="cx">
</span><ins>+add_filter( 'bp_get_activity_action', 'stripslashes_deep' );
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'stripslashes_deep' );
</span><ins>+add_filter( 'bp_get_activity_content_body', 'stripslashes_deep' );
</ins><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'stripslashes_deep' );
</span><span class="cx"> add_filter( 'bp_get_activity_latest_update', 'stripslashes_deep' );
</span><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'stripslashes_deep' );
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (2674 => 2675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-02-11 14:11:07 UTC (rev 2674)
+++ trunk/bp-groups.php 2010-02-11 14:50:47 UTC (rev 2675)
</span><span class="lines">@@ -1627,6 +1627,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $membership = new BP_Groups_Member( $user_id, $group_id );
+
</ins><span class="cx"> // This is exactly the same as deleting an invite, just is_confirmed = 1 NOT 0.
</span><span class="cx"> if ( !groups_uninvite_user( $user_id, $group_id ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -1637,6 +1639,12 @@
</span><span class="cx"> /* Modify user's group memberhip count */
</span><span class="cx"> update_usermeta( $user_id, 'total_group_count', (int) get_usermeta( $user_id, 'total_group_count') - 1 );
</span><span class="cx">
</span><ins>+ /* If the user joined this group less than five minutes ago, remove the joined_group activity so
+ * users cannot flood the activity stream by joining/leaving the group in quick succession.
+ */
+ if ( function_exists( 'bp_activity_delete' ) && gmmktime() <= strtotime( '+5 minutes', (int)strtotime( $membership->date_modified ) ) )
+ bp_activity_delete( array( 'component' => $bp->groups->id, 'type' => 'joined_group', 'user_id' => $user_id, 'item_id' => $group_id ) );
+
</ins><span class="cx"> bp_core_add_message( __( 'You successfully left the group.', 'buddypress' ) );
</span><span class="cx">
</span><span class="cx"> do_action( 'groups_leave_group', $group_id, $user_id );
</span></span></pre>
</div>
</div>
</body>
</html>