Changeset 4965

Timestamp:

08/11/2011 08:44:20 PM (15 years ago)

Author:

djpaul

Message:

Fix blog posts not showing in activity stream in non-multisites. Fixes #3445, props boonebgorges and paulgibbs

Location:

trunk

Files:

• bp-blogs/bp-blogs-functions.php (modified) (5 diffs)
• bp-blogs/bp-blogs-loader.php (modified) (1 diff)
• bp-core/admin/bp-core-admin.php (modified) (3 diffs)
• bp-core/admin/bp-core-update.php (modified) (9 diffs)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-core/bp-core-loader.php (modified) (1 diff)

trunk/bp-blogs/bp-blogs-functions.php

@@ -50 +50 @@
         $wpdb->query( "TRUNCATE TABLE {$bp->blogs->table_name}" );
 
-        $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0" ) );
+        if ( is_multisite() )
+                $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0" ) );
+        else
+                $blog_ids = 1;
 
         if ( $blog_ids ) {
@@ -57 +60 @@
                         $subscribers    = get_users( array( 'blog_id' => $blog_id, 'role' => 'subscriber' ) );
 
-                        if ( $users ) {
+                        if ( !empty( $users ) ) {
                                 foreach ( (array)$users as $user ) {
                                         // Don't record blogs for subscribers
@@ -461 +464 @@
         global $wpdb, $bp;
 
-        if ( !is_numeric( $blog_id ) || !is_multisite() )
+        if ( !is_numeric( $blog_id ) )
                 return false;
 
@@ -488 +491 @@
         $blog_id = (int) $blog_id;
 
-        if ( !$blog_id || !is_multisite() )
+        if ( !$blog_id )
                 return false;
 
@@ -520 +523 @@
         global $wpdb, $bp;
 
-        if ( !is_numeric( $blog_id ) || !is_multisite() )
+        if ( !is_numeric( $blog_id ) )
                 return false;
 

trunk/bp-blogs/bp-blogs-loader.php

@@ -54 +54 @@
                         'slug'                  => BP_BLOGS_SLUG,
                         'root_slug'             => isset( $bp->pages->blogs->slug ) ? $bp->pages->blogs->slug : BP_BLOGS_SLUG,
-                        'has_directory'         => true,
+                        'has_directory'         => is_multisite(), // Non-multisite installs don't need a top-level Sites directory, since there's only one site
                         'notification_callback' => 'bp_blogs_format_notifications',
                         'search_string'         => __( 'Search sites...', 'buddypress' ),

trunk/bp-core/admin/bp-core-admin.php

@@ -12 +12 @@
 }
 add_action( 'in_plugin_update_message-buddypress/bp-loader.php', 'bp_core_update_message' );
-
-/**
- * Renders the main admin panel.
- *
- * @package BuddyPress Core
- * @since {@internal Unknown}}
- */
-function bp_core_admin_dashboard() {
-        $base_url = bp_get_admin_url( 'admin.php' );
-        $action   = add_query_arg( array( 'page' => 'bp-general-settings' ), $base_url );
-        ?>
-
-        <div class="wrap" id="bp-admin">
-
-                <div id="bp-admin-header">
-                        <h3><?php _e( 'BuddyPress', 'buddypress' ); ?></h3>
-                        <h2><?php _e( 'Dashboard',  'buddypress' ); ?></h2>
-                </div>
-
-                <?php do_action( 'bp_admin_notices' ); ?>
-
-                <form action="<?php echo $action ?>" method="post" id="bp-admin-form">
-                        <div id="bp-admin-content">
-                                <p>[TODO: All sorts of awesome things will go here. Latest plugins and themes, stats, version check, support topics, news, tips]</p>
-                        </div>
-                </form>
-
-        </div>
-
-<?php
-}
 
 /**
@@ -348 +317 @@
                         'description' => __( 'Allow your users to modify their account and notification settings directly from within their profiles.', 'buddypress' )
                 ),
-                'friends' => array(
+                'friends'  => array(
                         'title'       => __( 'Friend Connections', 'buddypress' ),
                         'description' => __( 'Let your users make connections so they can track the activity of others and focus on the people they care about the most.', 'buddypress' )
@@ -360 +329 @@
                         'description' => __( 'Global, personal, and group activity streams with threaded commenting, direct posting, favoriting and @mentions, all with full RSS feed and email notification support.', 'buddypress' )
                 ),
-                'groups' => array(
+                'groups'   => array(
                         'title'       => __( 'User Groups', 'buddypress' ),
                         'description' => __( 'Groups allow your users to organize themselves into specific public, private or hidden sections with separate activity streams and member listings.', 'buddypress' )
                 ),
-                'forums' => array(
+                'forums'   => array(
                         'title'       => __( 'Discussion Forums', 'buddypress' ),
                         'description' => __( 'Full-powered discussion forums built directly into groups allow for more conventional in-depth conversations. NOTE: This will require an extra (but easy) setup step.', 'buddypress' )
+                ),
+                'blogs'    => array(
+                        'title'       => __( 'Site Tracking', 'buddypress' ),
+                        'description' => __( 'Make BuddyPress aware of new posts and new comments from your site.', 'buddypress' )
                 )
         ) );
 
-        if ( is_multisite() ) {
-                $optional_components['blogs'] = array(
-                        'title'       => __( 'Site Tracking', 'buddypress' ),
-                        'description' => __( 'Track new sites, new posts and new comments across your entire network.', 'buddypress' )
-                );
-        }
+        if ( is_multisite() ) 
+                $optional_components['blogs']['description'] = __( 'Make BuddyPress aware of new sites, new posts and new comments from across your entire network.', 'buddypress' ); 
 
         // Required components

trunk/bp-core/admin/bp-core-update.php

@@ -302 +302 @@
                                 <th scope="row">
                                         <h5><?php _e( 'Sites', 'buddypress' ); ?></h5>
-                                        <p><?php _e( 'Displays individual groups as well as a directory of groups.', 'buddypress' ); ?></p>
+                                        <p><?php _e( 'Displays a directory of the sites in your network.', 'buddypress' ); ?></p>
                                 </th>
                                 <td>
@@ -312 +312 @@
                 </table>
 
-                <p><?php _e( 'Would you like to enable site tracking, which tracks activity across all of your network?', 'buddypress' ); ?></p>
+                <p><?php _e( 'Would you like to enable site tracking, which tracks blog posts and comments from across your network?', 'buddypress' ); ?></p>
 
                 <div class="left-col">
@@ -428 +428 @@
                         <tr valign="top">
                                 <th scope="row">
-                                        <h5><?php _e( 'Members', 'buddypres' ); ?></h5>
+                                        <h5><?php _e( 'Members', 'buddypress' ); ?></h5>
                                         <p><?php _e( 'Displays member profiles, and a directory of all site members.', 'buddypress' ); ?></p>
                                 </th>
@@ -472 +472 @@
                                         <th scope="row">
                                                 <h5><?php _e( 'Forums', 'buddypress' ); ?></h5>
-                                                <p><?php _e( 'Displays individual groups as well as a directory of groups.', 'buddypress' ); ?></p>
+                                                <p><?php _e( 'Displays a directory of public forum topics.', 'buddypress' ); ?></p>
                                         </th>
                                         <td>
@@ -482 +482 @@
                         <?php endif; ?>
 
+                        <?php /* The Blogs component only needs a directory page when Multisite is enabled */ ?>
                         <?php if ( is_multisite() && isset( $active_components['blogs'] ) ) : ?>
 
@@ -487 +488 @@
                                         <th scope="row">
                                                 <h5><?php _e( 'Sites', 'buddypress' ); ?></h5>
-                                                <p><?php _e( 'Displays individual groups as well as a directory of groups.', 'buddypress' ); ?></p>
+                                                <p><?php _e( 'Displays a directory of the sites in your network.', 'buddypress' ); ?></p>
                                         </th>
                                         <td>
@@ -1023 +1024 @@
                         if ( !function_exists( 'bp_core_update_message' ) )
                                 require( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-admin.php' );
+
                         bp_core_add_admin_menu();
 
@@ -1110 +1112 @@
                 bp_core_install_extended_profiles();
 
-        // Only install blog tables if this is a multisite installation
-        if ( is_multisite() && !empty( $active_components['blogs'] ) )
+        // Blog tracking
+        if ( !empty( $active_components['blogs'] ) )
                 bp_core_install_blog_tracking();
 }
@@ -1137 +1139 @@
 
         // On first installation - record all existing blogs in the system.
-        if ( !(int)$bp->site_options['bp-blogs-first-install'] && is_multisite() ) {
+        if ( !(int)$bp->site_options['bp-blogs-first-install'] ) {
                 bp_blogs_record_existing_blogs();
                 bp_update_option( 'bp-blogs-first-install', 1 );

trunk/bp-core/bp-core-functions.php

@@ -353 +353 @@
          * on the off chance that someone has activated the blogs component and then disabled MS
          */
-        if ( is_multisite() && bp_is_active( 'blogs' ) ) {
+        if ( bp_is_active( 'blogs' ) ) {
                 $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$bp->blogs->table_name}" ) );
 

trunk/bp-core/bp-core-loader.php

@@ -58 +58 @@
 
                 // Set the included and optional components.
-                $bp->optional_components = array( 'activity', 'forums', 'friends', 'groups', 'messages', 'settings', 'xprofile' );
-
-                // Blogs component only available for multisite
-                if ( is_multisite() )
-                        $bp->optional_components[] = 'blogs';
-
-                $bp->optional_components    = apply_filters( 'bp_optional_components', $bp->optional_components );
+                $bp->optional_components = apply_filters( 'bp_optional_components', array( 'activity', 'blogs', 'forums', 'friends', 'groups', 'messages', 'settings', 'xprofile' ) );
 
                 // Set the required components
-                $bp->required_components    = apply_filters( 'bp_required_components', array( 'members' ) );
+                $bp->required_components = apply_filters( 'bp_required_components', array( 'members' ) );
 
                 // Get a list of activated components