<!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][10631] branches/2.5/src/bp-blogs/bp-blogs-functions.php: Make sure the Activity Component is active before using functions relative to it inside the Blogs component.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10631">10631</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10631","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-04 18:37:59 +0000 (Fri, 04 Mar 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Make sure the Activity Component is active before using functions relative to it inside the Blogs component.
<a href="http://buddypress.trac.wordpress.org/changeset/10544">r10544</a> introduced a side effect on the BuddyPress Emails feature when the Blogs component is activated and the Activity one is deactivated.
This changeset removed some `bp_is_active()` checks inside `bp_blogs_delete_activity()` and `bp_blogs_record_activity()` in favor a conditional load of the whole `bp-blogs/bp-blogs-activity.php` file.
Unfortunately, an issue appeared when the Activity component is not active because these functions are used when some WordPress hooks are fired, for instance when a post type is deleted.
For the 2.5 Branch we are bringing back the `bp_is_active()` checks before using the two functions mentioned earlier. For next release, we will carry on moving all the code specific to the activity component inside the `bp-blogs/bp-blogs-activity.php` file.
See <a href="http://buddypress.trac.wordpress.org/ticket/6937">#6937</a> (branch 2.5)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches25srcbpblogsbpblogsfunctionsphp">branches/2.5/src/bp-blogs/bp-blogs-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches25srcbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.5/src/bp-blogs/bp-blogs-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.5/src/bp-blogs/bp-blogs-functions.php 2016-03-04 18:01:42 UTC (rev 10630)
+++ branches/2.5/src/bp-blogs/bp-blogs-functions.php 2016-03-04 18:37:59 UTC (rev 10631)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,8 +279,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $is_private = !empty( $_POST['blog_public'] ) && (int) $_POST['blog_public'] ? false : true;
</span><span class="cx" style="display: block; padding: 0 10px"> $is_private = !apply_filters( 'bp_is_new_blog_public', !$is_private );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Only record this activity if the blog is public.
- if ( !$is_private && !$no_activity && bp_blogs_is_blog_trackable( $blog_id, $user_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only record this activity if the activity component is active and the blog is public.
+ if ( bp_is_active( 'activity' ) && !$is_private && !$no_activity && bp_blogs_is_blog_trackable( $blog_id, $user_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Record this in activity streams.
</span><span class="cx" style="display: block; padding: 0 10px"> bp_blogs_record_activity( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -815,12 +815,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> BP_Blogs_Blog::delete_blog_for_all( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Delete activity stream item.
- bp_blogs_delete_activity( array(
- 'item_id' => $blog_id,
- 'component' => buddypress()->blogs->id,
- 'type' => 'new_blog'
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Delete activity stream item only if the Activity component is active
+ *
+ * @see https://buddypress.trac.wordpress.org/ticket/6937
+ */
+ if ( bp_is_active( 'activity' ) ) {
+ bp_blogs_delete_activity( array(
+ 'item_id' => $blog_id,
+ 'component' => buddypress()->blogs->id,
+ 'type' => 'new_blog'
+ ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after a "blog created" item has been removed from blogs
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -857,12 +863,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> BP_Blogs_Blog::delete_blog_for_user( $blog_id, $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Delete activity stream item.
- bp_blogs_delete_activity( array(
- 'item_id' => $blog_id,
- 'component' => buddypress()->blogs->id,
- 'type' => 'new_blog'
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Delete activity stream item only if the Activity component is active
+ *
+ * @see https://buddypress.trac.wordpress.org/ticket/6937
+ */
+ if ( bp_is_active( 'activity' ) ) {
+ bp_blogs_delete_activity( array(
+ 'item_id' => $blog_id,
+ 'component' => buddypress()->blogs->id,
+ 'type' => 'new_blog'
+ ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after a blog has been removed from the tracker for a specific user.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -910,13 +922,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_blogs_before_remove_post', $blog_id, $post_id, $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Delete activity stream item.
- bp_blogs_delete_activity( array(
- 'item_id' => $blog_id,
- 'secondary_item_id' => $post_id,
- 'component' => buddypress()->blogs->id,
- 'type' => 'new_blog_post'
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Delete activity stream item only if the Activity component is active
+ *
+ * @see https://buddypress.trac.wordpress.org/ticket/6937
+ */
+ if ( bp_is_active( 'activity' ) ) {
+ bp_blogs_delete_activity( array(
+ 'item_id' => $blog_id,
+ 'secondary_item_id' => $post_id,
+ 'component' => buddypress()->blogs->id,
+ 'type' => 'new_blog_post'
+ ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after removal of a blog post activity item from the activity stream.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1108,12 +1126,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If this is regular blog, delete all data for that blog.
</span><span class="cx" style="display: block; padding: 0 10px"> BP_Blogs_Blog::delete_blog_for_all( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Delete activity stream item.
- bp_blogs_delete_activity( array(
- 'item_id' => $blog_id,
- 'component' => buddypress()->blogs->id,
- 'type' => false
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Delete activity stream item only if the Activity component is active
+ *
+ * @see https://buddypress.trac.wordpress.org/ticket/6937
+ */
+ if ( bp_is_active( 'activity' ) ) {
+ bp_blogs_delete_activity( array(
+ 'item_id' => $blog_id,
+ 'component' => buddypress()->blogs->id,
+ 'type' => false
+ ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after all data related to a given blog has been removed from blogs tracker
</span></span></pre>
</div>
</div>
</body>
</html>