<!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] [2409] trunk: Fixes #1671</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2409</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-23 13:48:47 +0000 (Sat, 23 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1671</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglemessagessinglephp">trunk/bp-themes/bp-default/members/single/messages/single.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (2408 => 2409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-01-22 22:06:40 UTC (rev 2408)
+++ trunk/bp-groups.php 2010-01-23 13:48:47 UTC (rev 2409)
</span><span class="lines">@@ -1332,16 +1332,7 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- /* Check for an existing entry and update if one exists. */
- $id = bp_activity_get_activity_id( array(
- 'user_id' => $user_id,
- 'component' => $component,
- 'type' => $type,
- 'item_id' => $item_id,
- 'secondary_item_id' => $secondary_item_id
- ) );
-
- return bp_activity_add( array( 'id' => $id, 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
</del><ins>+ return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function groups_update_last_activity( $group_id ) {
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (2408 => 2409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-22 22:06:40 UTC (rev 2408)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-23 13:48:47 UTC (rev 2409)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx">
</span><span class="cx"> check_ajax_referer( 'messages_send_message' );
</span><span class="cx">
</span><del>- $result = messages_new_message( array( 'thread_id' => $_REQUEST['thread_id'], 'subject' => $_REQUEST['subject'], 'content' => $_REQUEST['content'] ) );
</del><ins>+ $result = messages_new_message( array( 'thread_id' => $_REQUEST['thread_id'], 'content' => $_REQUEST['content'] ) );
</ins><span class="cx">
</span><span class="cx"> if ( $result ) { ?>
</span><span class="cx"> <div class="message-box new-message">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglemessagessinglephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/messages/single.php (2408 => 2409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/messages/single.php 2010-01-22 22:06:40 UTC (rev 2408)
+++ trunk/bp-themes/bp-default/members/single/messages/single.php 2010-01-23 13:48:47 UTC (rev 2409)
</span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <input type="hidden" id="thread_id" name="thread_id" value="<?php bp_the_thread_id(); ?>" />
</span><del>- <input type="hidden" name="subject" id="subject" value="<?php _e( 'Re: ', 'buddypress' ); echo str_replace( 'Re: ', '', bp_get_the_thread_subject() ); ?>" />
</del><span class="cx"> <?php wp_nonce_field( 'messages_send_message', 'send_message_nonce' ) ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- .message-content -->
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (2408 => 2409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-01-22 22:06:40 UTC (rev 2408)
+++ trunk/bp-xprofile.php 2010-01-23 13:48:47 UTC (rev 2409)
</span><span class="lines">@@ -496,16 +496,7 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- /* Check for an existing entry and update if one exists. */
- $id = bp_activity_get_activity_id( array(
- 'user_id' => $user_id,
- 'component' => $component,
- 'type' => $type,
- 'item_id' => $item_id,
- 'secondary_item_id' => $secondary_item_id
- ) );
-
- return bp_activity_add( array( 'id' => $id, 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
</del><ins>+ return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>