Ticket #3153: aperture-science.patch

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

@@ -363 +363 @@
 
                 $existing_pages = bp_core_update_get_page_meta();
 
-                // Get active components
-                $active_components = apply_filters( 'bp_active_components', get_site_option( 'bp-active-components' ) );
+                if ( 'update' == $this->setup_type ) {
+                        // Pre-1.3 backwards compatibility
+                        $old_deactivated_components = get_site_option( 'bp-deactivated-components' );
 
+                        // Trim off namespace and filename
+                        $trimmed = array();
+                        foreach ( (array) $old_deactivated_components as $component => $value )
+                                $trimmed[] = str_replace( '.php', '', str_replace( 'bp-', '', $component ) );
+
+                        $active_components = array_flip( array_diff( array_values( array( 'members', 'groups', 'activity', 'forums', 'blogs', 'register', 'activate' ) ), array_values( $trimmed ) ) );
+
+                        // Loop through active components and set the values
+                        foreach( $new_active_components as $component => $value )
+                                $active_components[$component] = 1;
+
+                } else {
+                        // Get active components
+                        $active_components = apply_filters( 'bp_active_components', get_site_option( 'bp-active-components' ) );
+                }
+
                 // Check for defined slugs
                 $members_slug    = !empty( $bp->members->slug    ) ? $bp->members->slug    : __( 'members',  'buddypress' );