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

Timestamp:

07/04/2011 04:59:01 PM (15 years ago)

Author:

johnjamesjacoby

Message:

• Swap BP_ROOT_BLOG const usage for new bp_get_root_blog_id() function
• Use bp_get_root_blog_id() place of bp_get_option_blog_id()
• Check for BP_ENABLE_MULTIBLOG when assigning root blog ID

See #3313, #3314.

File:

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

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

@@ -777 +777 @@
                                 $active_components['blogs'] = 1;
 
-                                // Make sure that the pages are created on the BP_ROOT_BLOG, no matter which Dashboard the setup is being run on
-                                if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != BP_ROOT_BLOG ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
-                                        switch_to_blog( BP_ROOT_BLOG );
+                                // Make sure that the pages are created on the bp_get_root_blog_id(), no matter which Dashboard the setup is being run on
+                                if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
+                                        switch_to_blog( bp_get_root_blog_id() );
 
                                 // Move bp-pages data from the blog options table to site options
@@ -789 +789 @@
                                 bp_update_option( 'bp-pages', $existing_pages );
 
-                                if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != BP_ROOT_BLOG ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
+                                if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
                                         restore_current_blog();
 
@@ -831 +831 @@
                         check_admin_referer( 'bpwizard_pages' );
 
-                        // Make sure that the pages are created on the BP_ROOT_BLOG, no matter which Dashboard the setup is being run on
-                        if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != BP_ROOT_BLOG ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
-                                switch_to_blog( BP_ROOT_BLOG );
+                        // Make sure that the pages are created on the bp_get_root_blog_id(), no matter which Dashboard the setup is being run on
+                        if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
+                                switch_to_blog( bp_get_root_blog_id() );
 
                         // Delete any existing pages
@@ -844 +844 @@
                         bp_update_option( 'bp-pages', $blog_pages );
 
-                        if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != BP_ROOT_BLOG ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
+                        if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
                                 restore_current_blog();
 
@@ -958 +958 @@
                         check_admin_referer( 'bpwizard_theme' );
 
-                        if ( is_multisite() && BP_ROOT_BLOG != get_current_blog_id() )
-                                switch_to_blog( BP_ROOT_BLOG );
+                        if ( is_multisite() && bp_get_root_blog_id() != get_current_blog_id() )
+                                switch_to_blog( bp_get_root_blog_id() );
 
                         switch ( $_POST['theme'] ) {