<!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][10731] trunk/src/bp-blogs: Blogs: Move activity-related code from `bp-blogs-functions.php` to `bp-blogs-activity.php`.</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/10731">10731</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/10731","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-04 17:25:57 +0000 (Wed, 04 May 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'>Blogs: Move activity-related code from `bp-blogs-functions.php` to `bp-blogs-activity.php`.
Instead of hardcoding activity code and needing to check for the Activity
component in `bp-blogs-functions.php`, this commit moves this activity code
code to `bp-blogs-activity.php` and also hooks this code to appropriate
blog actions.
This allows developers to easily remove said activity hook if needed.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6937">#6937</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsactivityphp">trunk/src/bp-blogs/bp-blogs-activity.php</a></li>
<li><a href="#trunksrcbpblogsbpblogsfunctionsphp">trunk/src/bp-blogs/bp-blogs-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogsactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-activity.php 2016-05-04 17:17:46 UTC (rev 10730)
+++ trunk/src/bp-blogs/bp-blogs-activity.php 2016-05-04 17:25:57 UTC (rev 10731)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,6 +606,124 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $open;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** SITE TRACKING *******************************************************/
+
+/**
+ * Add an activity entry for a newly-created site.
+ *
+ * Hooked to the 'bp_blogs_new_blog' action.
+ *
+ * @since 2.6.0
+ *
+ * @param BP_Blogs_Blog $recorded_blog Current site being recorded. Passed by reference.
+ * @param bool $is_private Whether the current site being recorded is private.
+ * @param bool $is_recorded Whether the current site was recorded.
+ */
+function bp_blogs_record_activity_on_site_creation( $recorded_blog, $is_private, $is_recorded, $no_activity ) {
+ // Only record this activity if the blog is public.
+ if ( ! $is_private && ! $no_activity && bp_blogs_is_blog_trackable( $recorded_blog->blog_id, $recorded_blog->user_id ) ) {
+ bp_blogs_record_activity( array(
+ 'user_id' => $recorded_blog->user_id,
+ 'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', bp_blogs_get_blogmeta( $recorded_blog->blog_id, 'url' ), $recorded_blog->blog_id ),
+ 'type' => 'new_blog',
+ 'item_id' => $recorded_blog->blog_id
+ ) );
+ }
+}
+add_action( 'bp_blogs_new_blog', 'bp_blogs_record_activity_on_site_creation', 10, 4 );
+
+/**
+ * Deletes the 'new_blog' activity entry when a site is deleted.
+ *
+ * @since 2.6.0
+ *
+ * @param int $blog_id Site ID.
+ */
+function bp_blogs_delete_new_blog_activity_for_site( $blog_id ) {
+ bp_blogs_delete_activity( array(
+ 'item_id' => $blog_id,
+ 'component' => buddypress()->blogs->id,
+ 'type' => 'new_blog'
+ ) );
+}
+add_action( 'bp_blogs_remove_blog', 'bp_blogs_delete_new_blog_activity_for_site' );
+add_action( 'bp_blogs_remove_blog_for_user', 'bp_blogs_delete_new_blog_activity_for_site' );
+
+/**
+ * Delete all 'blogs' activity items for a site when the site is deleted.
+ *
+ * @since 2.6.0
+ *
+ * @param int $blog_id Site ID.
+ */
+function bp_blogs_delete_activity_for_site( $blog_id ) {
+ bp_blogs_delete_activity( array(
+ 'item_id' => $blog_id,
+ 'component' => buddypress()->blogs->id,
+ 'type' => false
+ ) );
+}
+add_action( 'bp_blogs_remove_data_for_blog', 'bp_blogs_delete_activity_for_site' );
+
+/**
+ * Remove a blog post activity item from the activity stream.
+ *
+ * @since 1.0.0
+ *
+ * @param int $post_id ID of the post to be removed.
+ * @param int $blog_id Optional. Defaults to current blog ID.
+ * @param int $user_id Optional. Defaults to the logged-in user ID. This param
+ * is currently unused in the function (but is passed to hooks).
+ * @return bool
+ */
+function bp_blogs_remove_post( $post_id, $blog_id = 0, $user_id = 0 ) {
+ global $wpdb;
+
+ if ( empty( $wpdb->blogid ) ) {
+ return false;
+ }
+
+ $post_id = (int) $post_id;
+
+ if ( ! $blog_id ) {
+ $blog_id = (int) $wpdb->blogid;
+ }
+
+ if ( ! $user_id ) {
+ $user_id = bp_loggedin_user_id();
+ }
+
+ /**
+ * Fires before removal of a blog post activity item from the activity stream.
+ *
+ * @since 1.5.0
+ *
+ * @param int $blog_id ID of the blog associated with the post that was removed.
+ * @param int $post_id ID of the post that was removed.
+ * @param int $user_id ID of the user having the blog removed for.
+ */
+ do_action( 'bp_blogs_before_remove_post', $blog_id, $post_id, $user_id );
+
+ bp_blogs_delete_activity( array(
+ 'item_id' => $blog_id,
+ 'secondary_item_id' => $post_id,
+ 'component' => buddypress()->blogs->id,
+ 'type' => 'new_blog_post'
+ ) );
+
+ /**
+ * Fires after removal of a blog post activity item from the activity stream.
+ *
+ * @since 1.0.0
+ *
+ * @param int $blog_id ID of the blog associated with the post that was removed.
+ * @param int $post_id ID of the post that was removed.
+ * @param int $user_id ID of the user having the blog removed for.
+ */
+ do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $user_id );
+}
+add_action( 'delete_post', 'bp_blogs_remove_post' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** POST COMMENT SYNCHRONIZATION ****************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-functions.php 2016-05-04 17:17:46 UTC (rev 10730)
+++ trunk/src/bp-blogs/bp-blogs-functions.php 2016-05-04 17:25:57 UTC (rev 10731)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,18 +279,6 @@
</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 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 ) ) {
-
- // Record this in activity streams.
- bp_blogs_record_activity( array(
- 'user_id' => $recorded_blog->user_id,
- 'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', $url, $recorded_blog->blog_id ),
- 'type' => 'new_blog',
- 'item_id' => $recorded_blog->blog_id
- ) );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after BuddyPress has been made aware of a new site for activity tracking.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,19 +806,6 @@
</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><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 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'
- ) );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Fires after a "blog created" item has been removed from blogs
</span><span class="cx" style="display: block; padding: 0 10px"> * tracker and activity stream.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -891,67 +866,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'remove_user_from_blog', 'bp_blogs_remove_blog_for_user', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Remove a blog post activity item from the activity stream.
- *
- * @param int $post_id ID of the post to be removed.
- * @param int $blog_id Optional. Defaults to current blog ID.
- * @param int $user_id Optional. Defaults to the logged-in user ID. This param
- * is currently unused in the function (but is passed to hooks).
- * @return bool
- */
-function bp_blogs_remove_post( $post_id, $blog_id = 0, $user_id = 0 ) {
- global $wpdb;
-
- if ( empty( $wpdb->blogid ) )
- return false;
-
- $post_id = (int) $post_id;
-
- if ( !$blog_id )
- $blog_id = (int) $wpdb->blogid;
-
- if ( !$user_id )
- $user_id = bp_loggedin_user_id();
-
- /**
- * Fires before removal of a blog post activity item from the activity stream.
- *
- * @since 1.5.0
- *
- * @param int $blog_id ID of the blog associated with the post that was removed.
- * @param int $post_id ID of the post that was removed.
- * @param int $user_id ID of the user having the blog removed for.
- */
- do_action( 'bp_blogs_before_remove_post', $blog_id, $post_id, $user_id );
-
- /**
- * 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'
- ) );
- }
-
- /**
- * Fires after removal of a blog post activity item from the activity stream.
- *
- * @since 1.0.0
- *
- * @param int $blog_id ID of the blog associated with the post that was removed.
- * @param int $post_id ID of the post that was removed.
- * @param int $user_id ID of the user having the blog removed for.
- */
- do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $user_id );
-}
-add_action( 'delete_post', 'bp_blogs_remove_post' );
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Remove a synced activity comment from the activity stream.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1129,19 +1043,6 @@
</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><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 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
- ) );
- }
-
- /**
</del><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 class="cx" style="display: block; padding: 0 10px"> * and activity stream.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>