<!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][3640] trunk/bp-blogs.php: Adds the original blog name to the activity action for new blog post/comment activity items on MS.</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>3640</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-01-01 20:06:28 +0000 (Sat, 01 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds the original blog name to the activity action for new blog post/comment activity items on MS. Fixes #2028. Props sorich87</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (3639 => 3640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2011-01-01 19:47:08 UTC (rev 3639)
+++ trunk/bp-blogs.php 2011-01-01 20:06:28 UTC (rev 3640)
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> $user_id = (int)$post->post_author;
</span><span class="cx">
</span><span class="cx"> // This is to stop infinite loops with Donncha's sitewide tags plugin
</span><del>- if ( (int)$blog_id == (int)$bp->site_options['tags_blog_id'] )
</del><ins>+ if ( !empty( $bp->site_options['tags_blog_id'] ) && (int)$blog_id == (int)$bp->site_options['tags_blog_id'] )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Don't record this if it's not a post
</span><span class="lines">@@ -367,7 +367,13 @@
</span><span class="cx"> if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
</span><span class="cx"> // Record this in activity streams
</span><span class="cx"> $post_permalink = get_permalink( $post_id );
</span><del>- $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
</del><ins>+
+ if ( is_multisite() ) {
+ $activity_action = sprintf( __( '%s wrote a new blog post: %s on the blog %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
+ } else {
+ $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+ }
+
</ins><span class="cx"> $activity_content = $post->post_content;
</span><span class="cx">
</span><span class="cx"> bp_blogs_record_activity( array(
</span><span class="lines">@@ -385,7 +391,7 @@
</span><span class="cx"> // Update the blogs last activity
</span><span class="cx"> bp_blogs_update_blogmeta( $blog_id, 'last_activity', bp_core_current_time() );
</span><span class="cx"> } else {
</span><del>- bp_blogs_remove_post( $post_id, $blog_id );
</del><ins>+ bp_blogs_remove_post( $post_id, $blog_id, $user_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'bp_blogs_new_blog_post', $post_id, $post, $user_id );
</span><span class="lines">@@ -442,9 +448,14 @@
</span><span class="cx"> $comment_link = htmlspecialchars( get_comment_link( $recorded_comment->comment_ID ) );
</span><span class="cx">
</span><span class="cx"> // Prepare to record in activity streams
</span><del>- $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>' );
</del><ins>+ if ( is_multisite() ) {
+ $activity_action = sprintf( __( '%s commented on the blog post %s on the blog %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
+ } else {
+ $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>' );
+ }
+
</ins><span class="cx"> $activity_content = $recorded_comment->comment_content;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Record in activity streams
</span><span class="cx"> bp_blogs_record_activity( array(
</span><span class="cx"> 'user_id' => $user_id,
</span><span class="lines">@@ -537,7 +548,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'remove_user_from_blog', 'bp_blogs_remove_blog_for_user', 10, 2 );
</span><span class="cx">
</span><del>-function bp_blogs_remove_post( $post_id, $blog_id = false ) {
</del><ins>+function bp_blogs_remove_post( $post_id, $blog_id = false, $user_id = false ) {
</ins><span class="cx"> global $current_blog, $bp;
</span><span class="cx">
</span><span class="cx"> $post_id = (int)$post_id;
</span><span class="lines">@@ -545,10 +556,13 @@
</span><span class="cx"> if ( !$blog_id )
</span><span class="cx"> $blog_id = (int)$current_blog->blog_id;
</span><span class="cx">
</span><ins>+ if ( !$user_id )
+ $user_id = $bp->loggedin_user->id;
+
</ins><span class="cx"> // Delete activity stream item
</span><span class="cx"> bp_blogs_delete_activity( array( 'item_id' => $blog_id, 'secondary_item_id' => $post_id, 'component' => $bp->blogs->slug, 'type' => 'new_blog_post' ) );
</span><span class="cx">
</span><del>- do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $post->user_id );
</del><ins>+ do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $user_id );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'delete_post', 'bp_blogs_remove_post' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>