Changeset 4992

Timestamp:

08/16/2011 08:31:07 PM (13 years ago)

Author:

boonebgorges

Message:

Adds Components step into upgrade Wizard when coming from pre-1.5, so that active components are properly migrated from bp-deactivated-components (and are activated in the correct order). Fixes #3480

Location:

trunk/bp-core/admin

Files:

• bp-core-admin.php (modified) (1 diff)
• bp-core-update.php (modified) (1 diff)

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

@@ -343 +343 @@
     );
 
-    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

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

@@ -85 +85 @@
                 $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' );