<!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] [1849] trunk:
Updated support for profile wire post activity stream item deletion.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1849</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-10 19:29:51 +0000 (Thu, 10 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updated support for profile wire post activity stream item deletion.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.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 (1848 => 1849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2009-09-10 19:11:33 UTC (rev 1848)
+++ trunk/bp-activity/bp-activity-classes.php 2009-09-10 19:29:51 UTC (rev 1849)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $user_id )
</span><span class="cx"> $user_sql = $wpdb->prepare( "AND user_id = %d", $user_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (1848 => 1849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2009-09-10 19:11:33 UTC (rev 1848)
+++ trunk/bp-xprofile.php 2009-09-10 19:29:51 UTC (rev 1849)
</span><span class="lines">@@ -554,9 +554,9 @@
</span><span class="cx"> 'content' => $content,
</span><span class="cx"> 'primary_link' => $primary_link,
</span><span class="cx"> 'component_action' => 'new_wire_post',
</span><del>- 'item_id' => $wire_post->item_id
</del><ins>+ 'item_id' => $wire_post->id
</ins><span class="cx"> ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action( 'xprofile_new_wire_post', &$wire_post );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -593,10 +593,13 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wire_post_id = $bp->action_variables[0];
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( bp_wire_delete_post( $wire_post_id, $bp->profile->slug, $bp->profile->table_name_wire ) ) {
</span><span class="cx"> bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') );
</span><span class="cx">
</span><ins>+ /* Delete the post from activity streams */
+ xprofile_delete_activity( array( 'item_id' => $wire_post_id, 'component_action' => 'new_wire_post' ) );
+
</ins><span class="cx"> do_action( 'xprofile_delete_wire_post', $wire_post_id );
</span><span class="cx"> } else {
</span><span class="cx"> bp_core_add_message( __('Wire post could not be deleted, please try again.', 'buddypress'), 'error' );
</span><span class="lines">@@ -678,10 +681,12 @@
</span><span class="cx"> * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</span><span class="cx"> * @uses bp_activity_delete() Deletes an entry to the activity component tables for a specific activity
</span><span class="cx"> */
</span><del>-function xprofile_delete_activity( $args = true ) {
- if ( function_exists('bp_activity_delete') ) {
</del><ins>+function xprofile_delete_activity( $args = '' ) {
+ global $bp;
+
+ if ( function_exists('bp_activity_delete_by_item_id') ) {
</ins><span class="cx"> extract($args);
</span><del>- bp_activity_delete( $item_id, $component_name, $component_action, $user_id, $secondary_item_id );
</del><ins>+ bp_activity_delete_by_item_id( array( 'item_id' => $item_id, 'component_name' => $bp->profile->id, 'component_action' => $component_action, 'user_id' => $user_id, 'secondary_item_id' => $secondary_item_id ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>