Changeset 4965 for trunk/bp-core/admin/bp-core-update.php

Timestamp:

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

Author:

djpaul

Message:

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

File:

• trunk/bp-core/admin/bp-core-update.php (modified) (9 diffs)

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 );