Ticket #4527: patchfile.patch

72a73,125
>  * Makes BuddyPress aware of sites that shouldn't be recordable. 
>  * If $user_id is provided, the developer can restrict site from
>  * being recordable only to particular users.
>  * 
>  * @since BuddyPress (1.6.1)
>  * @param int $blog_id
>  * @param int|null $user_id
>  * @uses apply_filters
>  * @return bool True if blog is recordable, false elsewhere
>  */
> function bp_blogs_is_blog_recordable( $blog_id, $user_id = null ) {
> 
>       $recordable_globally = apply_filters( 'bp_blogs_is_blog_recordable', true, $blog_id );
> 
>       if ( $user_id )
>               $recordable_for_user = apply_filters( 'bp_blogs_is_blog_recordable_for_user', $recordable_globally, $blog_id, $user_id );
>       else
>               $recordable_for_user = $recordable_globally;
> 
>       if ( $recordable_for_user )
>               return true;
> 
>       return $recordable_globally;
> }
> 
> /**
>  * Makes BuddyPress aware of sites that activities shouldn't be trackable.
>  * If $user_id is provided, the developer can restrict site from
>  * being trackable only to particular users.
>  * 
>  * @since BuddyPress (1.6.1)
>  * @param int $blog_id
>  * @param int|null $user_id
>  * @uses bp_blogs_is_blog_recordable
>  * @uses apply_filters
>  * @return bool True if blog is trackable, false elsewhere
>  */
> function bp_blogs_is_blog_trackable( $blog_id, $user_id = null ) {
> 
>       $trackable_globally = apply_filters( 'bp_blogs_is_blog_trackable', bp_blogs_is_blog_recordable( $blog_id, $user_id ), $blog_id );
> 
>       if ( $user_id )
>               $trackable_for_user = apply_filters( 'bp_blogs_is_blog_trackable_for_user', $trackable_globally, $blog_id, $user_id );
>       else
>               $trackable_for_user = $trackable_globally;
> 
>       if ( $trackable_for_user )
>               return $trackable_for_user;
> 
>       return $trackable_globally;
> }
> 
> /**
85a139,141
>       if ( !bp_blogs_is_blog_recordable( $blog_id, $user_id ) )
>               return false;
> 
106c162
<       if ( !$is_private && !$no_activity ) {
---
>       if ( !$is_private && !$no_activity && bp_blogs_is_blog_trackable( $blog_id, $user_id ) ) {
157a214,217
>   // If blog is not trackable, do not record the activity.
>   if ( !bp_blogs_is_blog_trackable( $blog_id, $user_id ) )
>     return false;
> 
264a325,328
>   // If blog is not trackable, do not record the activity.
>   if ( !bp_blogs_is_blog_trackable( $blog_id, $user_id ) )
>     return false;
>