Ticket #3480: 3480.01.patch

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

@@ -342 +342 @@
                 )
         );
 
-        if ( is_multisite() ) 
-                $optional_components['blogs']['description'] = __( 'Make BuddyPress aware of new sites, new posts and new comments from 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' );
+
+        // If this is an upgrade from before BuddyPress 1.5, we'll have to convert deactivated
+        // components into activated ones
+        if ( empty( $active_components ) ) {
+                $deactivated_components = bp_get_option( 'bp-deactivated-components' );
+
+                // Trim off namespace and filename
+                $trimmed = array();
+                foreach ( (array) $deactivated_components as $component => $value ) {
+                        $trimmed[] = str_replace( '.php', '', str_replace( 'bp-', '', $component ) );
+                }
+
+                // Loop through the optional components to create an active component array
+                foreach ( (array) $optional_components as $ocomponent => $ovalue ) {
+                        if ( !in_array( $ocomponent, $trimmed ) ) {
+                                $active_components[$ocomponent] = 1;
+                        }
+                }
+        }
 
         // Required components
         $required_components = array(

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

@@ -84 +84 @@
                         if ( $this->database_version < (int) $this->new_version )
                                 $steps[] = __( 'Database Update', 'buddypress' );
 
-                        if ( $this->database_version < 1801 || !bp_core_get_directory_page_ids() )
+                        if ( $this->database_version < 1801 || !bp_core_get_directory_page_ids() ) {
+                                $steps[] = __( 'Components', 'buddypress' );
                                 $steps[] = __( 'Pages', 'buddypress' );
+                        }
 
                         $steps[] = __( 'Finish', 'buddypress' );
                 }