<!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] [1805] trunk: Fixes status update activity recording.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1805</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-07 01:33:25 +0000 (Mon, 07 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes status update activity recording.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpstatusphp">trunk/bp-status.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (1804 => 1805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2009-09-07 00:33:40 UTC (rev 1804)
+++ trunk/bp-activity.php 2009-09-07 01:33:25 UTC (rev 1805)
</span><span class="lines">@@ -238,26 +238,8 @@
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> /* Insert the "time-since" placeholder */
</span><del>- if ( $content ) {
-
- /* Check a time-since span doesn't already exist */
- if ( false === strpos( $content, '<span class="time-since">' ) ) {
- if ( !$pos = strpos( $content, '<blockquote' ) ) {
- if ( !$pos = strpos( $content, '<div' ) ) {
- if ( !$pos = strpos( $content, '<ul' ) ) {
- $content .= ' <span class="time-since">%s</span>';
- }
- }
- }
- }
-
- if ( (int) $pos ) {
- $before = substr( $content, 0, (int) $pos );
- $after = substr( $content, (int) $pos, strlen( $content ) );
-
- $content = $before . ' <span class="time-since">%s</span>' . $after;
- }
- }
</del><ins>+ if ( $content )
+ $content = bp_activity_add_timesince_placeholder( $content );
</ins><span class="cx">
</span><span class="cx"> $activity = new BP_Activity_Activity;
</span><span class="cx"> $activity->user_id = $user_id;
</span><span class="lines">@@ -269,7 +251,7 @@
</span><span class="cx"> $activity->secondary_item_id = $secondary_item_id;
</span><span class="cx"> $activity->date_recorded = $recorded_time;
</span><span class="cx"> $activity->hide_sitewide = $hide_sitewide;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$activity->save() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -312,6 +294,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_activity_delete_by_content( $user_id, $content, $component_name, $component_action ) {
</span><ins>+ /* Insert the "time-since" placeholder to match the existing content in the DB */
+ $content = bp_activity_add_timesince_placeholder( $content );
+
</ins><span class="cx"> if ( !BP_Activity_Activity::delete_by_content( $user_id, $content, $component_name, $component_action ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -329,6 +314,29 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_activity_add_timesince_placeholder( $content ) {
+ /* Check a time-since span doesn't already exist */
+ if ( false === strpos( $content, '<span class="time-since">' ) ) {
+ if ( !$pos = strpos( $content, '<blockquote' ) ) {
+ if ( !$pos = strpos( $content, '<div' ) ) {
+ if ( !$pos = strpos( $content, '<ul' ) ) {
+ $content .= ' <span class="time-since">%s</span>';
+ }
+ }
+ }
+ }
+
+ if ( (int) $pos ) {
+ $before = substr( $content, 0, (int) $pos );
+ $after = substr( $content, (int) $pos, strlen( $content ) );
+
+ $content = $before . ' <span class="time-since">%s</span>' . $after;
+ }
+
+ return $content;
+}
+
+
</ins><span class="cx"> function bp_activity_set_action( $component_id, $key, $value ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpstatusphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-status.php (1804 => 1805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-status.php 2009-09-07 00:33:40 UTC (rev 1804)
+++ trunk/bp-status.php 2009-09-07 01:33:25 UTC (rev 1805)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> add_action( 'plugins_loaded', 'bp_status_register_activity_actions' );
</span><span class="cx">
</span><span class="cx"> function bp_status_record_activity( $user_id, $content, $primary_link, $component_action = 'new_status' ) {
</span><ins>+ global $bp;
+
</ins><span class="cx"> if ( !function_exists( 'bp_activity_add' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -47,36 +49,18 @@
</span><span class="cx"> 'user_id' => $user_id,
</span><span class="cx"> 'content' => $content,
</span><span class="cx"> 'primary_link' => $primary_link,
</span><del>- 'component_name' => 'status',
</del><ins>+ 'component_name' => $bp->status->id,
</ins><span class="cx"> 'component_action' => $component_action
</span><del>- ) );
</del><ins>+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_status_delete_activity( $user_id, $content ) {
</span><span class="cx"> if ( !function_exists( 'bp_activity_delete_by_content' ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> return bp_activity_delete_by_content( $user_id, $content, 'status', 'new_status' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_status_format_activity( $user_id, $content, $component_action = false ) {
- global $bp;
-
- if ( !$component_action )
- $component_action = 'new_status';
-
- $user_link = bp_core_get_userlink( $user_id );
-
- switch( $component_action ) {
- case 'new_status':
- $stream_item = sprintf( __( '%s posted a new status update:', 'buddypress' ), $user_link ) . '<span class="time-since">%s</span>';
- $stream_item .= "<blockquote>$content</blockquote>";
- break;
- }
-
- return apply_filters( 'bp_status_format_activity', $stream_item, $user_id, $content, $component_action );
-}
-
</del><span class="cx"> function bp_status_register_activity_action( $key, $value ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="lines">@@ -135,8 +119,14 @@
</span><span class="cx"> bp_status_clear_existing_activity( $user_id );
</span><span class="cx">
</span><span class="cx"> if ( update_usermeta( $user_id, 'bp_status', array( 'content' => $content, 'recorded_time' => $recorded_time ) ) ) {
</span><del>- bp_status_record_activity( $user_id, bp_status_format_activity( $user_id, $content ), bp_core_get_user_domain( $user_id ) );
</del><span class="cx">
</span><ins>+ /* Recored in activity streams */
+ $user_link = bp_core_get_userlink( $user_id );
+ $activity_content = sprintf( __( '%s posted a new status update:', 'buddypress' ), $user_link );
+ $activity_content .= "<blockquote>$content</blockquote>";
+
+ bp_status_record_activity( $user_id, $activity_content, $user_link );
+
</ins><span class="cx"> do_action( 'bp_status_add_status', $user_id, $content );
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -157,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> function bp_status_clear_existing_activity( $user_id ) {
</span><span class="cx"> /* Fetch existing status update if there is one. */
</span><del>- $existing_status = get_usermeta( $user_id, 'bp_status');
</del><ins>+ $existing_status = get_usermeta( $user_id, 'bp_status' );
</ins><span class="cx">
</span><span class="cx"> if ( '' != $existing_status ) {
</span><span class="cx"> if ( strtotime( '+5 minutes', $existing_status['recorded_time'] ) >= time() ) {
</span><span class="lines">@@ -165,7 +155,10 @@
</span><span class="cx"> * The last status was updated less than 5 minutes ago, so lets delete the activity stream item for that
</span><span class="cx"> * status update, to prevent flooding and allow users to change their mind about recording a status.
</span><span class="cx"> */
</span><del>- bp_status_delete_activity( $user_id, bp_status_format_activity( $user_id, $existing_status['content'] ) );
</del><ins>+ $activity_content = sprintf( __( '%s posted a new status update:', 'buddypress' ), bp_core_get_userlink( $user_id ) );
+ $activity_content .= "<blockquote>{$existing_status['content']}</blockquote>";
+
+ bp_status_delete_activity( $user_id, $activity_content );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>