diff -r f507feede89a -r 09a1c134465b web/wp-content/plugins/bbpress/includes/extend/buddypress/activity.php
--- a/web/wp-content/plugins/bbpress/includes/extend/buddypress/activity.php Wed Dec 19 12:35:13 2012 -0800
+++ b/web/wp-content/plugins/bbpress/includes/extend/buddypress/activity.php Wed Dec 19 17:46:52 2012 -0800
@@ -254,7 +254,7 @@
private function record_activity( $args = '' ) {
// Default activity args
- $defaults = array (
+ $activity = bbp_parse_args( $args, array(
'id' => null,
'user_id' => bbp_get_current_user_id(),
'type' => '',
@@ -266,8 +266,7 @@
'component' => $this->component,
'recorded_time' => bp_core_current_time(),
'hide_sitewide' => false
- );
- $activity = bbp_parse_args( $args, $defaults, 'record_activity' );
+ ), 'record_activity' );
// Add the activity
return bp_activity_add( $activity );
@@ -447,22 +446,18 @@
if ( !bbp_is_topic_published( $topic_id ) )
return;
- // Bail if forum is not public
- if ( !bbp_is_forum_public( $forum_id, false ) )
- return;
-
// User link for topic author
$user_link = bbp_get_user_profile_link( $user_id );
// Topic
$topic_permalink = bbp_get_topic_permalink( $topic_id );
- $topic_title = bbp_get_topic_title ( $topic_id );
- $topic_content = bbp_get_topic_content ( $topic_id );
+ $topic_title = get_post_field( 'post_title', $topic_id, 'raw' );
+ $topic_content = get_post_field( 'post_content', $topic_id, 'raw' );
$topic_link = '' . $topic_title . '';
// Forum
$forum_permalink = bbp_get_forum_permalink( $forum_id );
- $forum_title = bbp_get_forum_title ( $forum_id );
+ $forum_title = get_post_field( 'post_title', $forum_id, 'raw' );
$forum_link = '' . $forum_title . '';
// Activity action & text
@@ -481,6 +476,7 @@
'item_id' => $topic_id,
'secondary_item_id' => $forum_id,
'recorded_time' => get_post_time( 'Y-m-d H:i:s', true, $topic_id ),
+ 'hide_sitewide' => ! bbp_is_forum_public( $forum_id, false )
);
// Record the activity
@@ -597,25 +593,21 @@
if ( !bbp_is_reply_published( $reply_id ) )
return;
- // Bail if forum is not public
- if ( !bbp_is_forum_public( $forum_id, false ) )
- return;
-
// Setup links for activity stream
$user_link = bbp_get_user_profile_link( $user_id );
// Reply
- $reply_url = bbp_get_reply_url ( $reply_id );
- $reply_content = bbp_get_reply_content( $reply_id );
+ $reply_url = bbp_get_reply_url( $reply_id );
+ $reply_content = get_post_field( 'post_content', $reply_id, 'raw' );
// Topic
$topic_permalink = bbp_get_topic_permalink( $topic_id );
- $topic_title = bbp_get_topic_title ( $topic_id );
+ $topic_title = get_post_field( 'post_title', $topic_id, 'raw' );
$topic_link = '' . $topic_title . '';
// Forum
$forum_permalink = bbp_get_forum_permalink( $forum_id );
- $forum_title = bbp_get_forum_title ( $forum_id );
+ $forum_title = get_post_field( 'post_title', $forum_id, 'raw' );
$forum_link = '' . $forum_title . '';
// Activity action & text
@@ -634,6 +626,7 @@
'item_id' => $reply_id,
'secondary_item_id' => $topic_id,
'recorded_time' => get_post_time( 'Y-m-d H:i:s', true, $reply_id ),
+ 'hide_sitewide' => ! bbp_is_forum_public( $forum_id, false )
);
// Record the activity
@@ -706,3 +699,4 @@
}
}
endif;
+