Changeset 4978

Timestamp:

08/14/2011 04:25:54 PM (14 years ago)

Author:

djpaul

Message:

Fix multisite upgrading loosing existing component activation settings and page mapping. Fixes #3473

File:

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

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

@@ -766 +766 @@
             check_admin_referer( 'bpwizard_ms_update' );
 
-            if ( !$active_components = get_site_option( 'bp-active-components' ) )
+            if ( !$active_components = bp_get_option( 'bp-active-components' ) )
                 $active_components = array();
 
@@ -790 +790 @@
                 $bp_pages       = array_merge( (array)$existing_pages, (array)$bp_pages );
 
-                bp_update_option( 'bp-pages', $existing_pages );
+                bp_update_option( 'bp-pages', $bp_pages );
 
                 if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )