<!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] [3419] trunk/bp-blogs.php: Fixes #2728 (trunk)</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>3419</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-11-14 05:28:25 +0000 (Sun, 14 Nov 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixes #2728 (trunk)</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 (3418 => 3419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php        2010-11-14 05:27:12 UTC (rev 3418)
+++ trunk/bp-blogs.php        2010-11-14 05:28:25 UTC (rev 3419)
</span><span class="lines">@@ -348,38 +348,39 @@
</span><span class="cx">         if ( !$user_id )
</span><span class="cx">                 $user_id = (int)$post-&gt;post_author;
</span><span class="cx"> 
</span><del>-        /* This is to stop infinite loops with Donncha's sitewide tags plugin */
-        if ( (int)$bp-&gt;site_options['tags_blog_id'] == (int)$blog_id )
</del><ins>+        // This is to stop infinite loops with Donncha's sitewide tags plugin
+        if ( (int)$blog_id == (int)$bp-&gt;site_options['tags_blog_id'] )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><del>-        /* Don't record this if it's not a post */
-        if ( $post-&gt;post_type != 'post' )
</del><ins>+        // Don't record this if it's not a post
+        if ( 'post' != $post-&gt;post_type )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><del>-        if ( 'publish' == $post-&gt;post_status &amp;&amp; '' == $post-&gt;post_password ) {
-                if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !is_multisite() ) {
-                        /* Record this in activity streams */
-                        $post_permalink = get_permalink( $post_id );
-
-                        $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post-&gt;post_author ), '&lt;a href=&quot;' . $post_permalink . '&quot;&gt;' . $post-&gt;post_title . '&lt;/a&gt;' );
</del><ins>+        if ( 'publish' == $post-&gt;post_status &amp;&amp; empty( $post-&gt;post_password ) ) {
+                if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
+                        // Record this in activity streams
+                        $post_permalink   = get_permalink( $post_id );
+                        $activity_action  = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post-&gt;post_author ), '&lt;a href=&quot;' . $post_permalink . '&quot;&gt;' . $post-&gt;post_title . '&lt;/a&gt;' );
</ins><span class="cx">                         $activity_content = $post-&gt;post_content;
</span><span class="cx"> 
</span><span class="cx">                         bp_blogs_record_activity( array(
</span><del>-                                'user_id' =&gt; (int)$post-&gt;post_author,
-                                'action' =&gt; apply_filters( 'bp_blogs_activity_new_post_action', $activity_action, &amp;$post, $post_permalink ),
-                                'content' =&gt; apply_filters( 'bp_blogs_activity_new_post_content', $activity_content, &amp;$post, $post_permalink ),
-                                'primary_link' =&gt; apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
-                                'type' =&gt; 'new_blog_post',
-                                'item_id' =&gt; $blog_id,
</del><ins>+                                'user_id'            =&gt; (int)$post-&gt;post_author,
+                                'action'            =&gt; apply_filters( 'bp_blogs_activity_new_post_action', $activity_action, &amp;$post, $post_permalink ),
+                                'content'           =&gt; apply_filters( 'bp_blogs_activity_new_post_content', $activity_content, &amp;$post, $post_permalink ),
+                                'primary_link'      =&gt; apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
+                                'type'              =&gt; 'new_blog_post',
+                                'item_id'           =&gt; $blog_id,
</ins><span class="cx">                                 'secondary_item_id' =&gt; $post_id,
</span><del>-                                'recorded_time' =&gt; $post-&gt;post_date_gmt
</del><ins>+                                'recorded_time'     =&gt; $post-&gt;post_date_gmt
</ins><span class="cx">                         ));
</span><span class="cx">                 }
</span><del>-        } else
</del><ins>+
+                // Update the blogs last activity
+                bp_blogs_update_blogmeta( $blog_id, 'last_activity', bp_core_current_time() );
+        } else {
</ins><span class="cx">                 bp_blogs_remove_post( $post_id, $blog_id );
</span><ins>+        }
</ins><span class="cx"> 
</span><del>-        bp_blogs_update_blogmeta( $blog_id, 'last_activity', bp_core_current_time() );
-
</del><span class="cx">         do_action( 'bp_blogs_new_blog_post', $post_id, $post, $user_id );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'save_post', 'bp_blogs_record_post', 10, 2 );
</span></span></pre>
</div>
</div>

</body>
</html>