Changeset 2698 for trunk/bp-blogs.php

Timestamp:

02/12/2010 01:27:20 PM (16 years ago)

Author:

apeatling

Message:

Fixing up the sitewide blog posts widget to only show on multisite installations, and also to use the activity loop filtered on blog posts.

File:

• trunk/bp-blogs.php (modified) (3 diffs)

trunk/bp-blogs.php

@@ -9 +9 @@
 require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-classes.php' );
 require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-templatetags.php' );
-require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-widgets.php' );
+
+/* Include the sitewide blog posts widget if this is a multisite installation */
+if ( bp_core_is_multisite() )
+    require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-widgets.php' );
 
 function bp_blogs_install() {
@@ -437 +440 @@
         if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
             /* Now re-record the post in the activity streams */
-            $post_permalink = bp_post_get_permalink( $post, $blog_id );
+            $post_permalink = get_permalink( $post_id );
 
             $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
@@ -495 +498 @@
     if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
         /* Record in activity streams */
-        $comment_link = bp_post_get_permalink( $comment->post, $wpdb->blogid ) . '#comment-' . $comment_id;
+        $comment_link = get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment_id;
         $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
         $activity_content = $comment->comment_content;