Changeset 3613

Timestamp:

12/30/2010 03:31:56 PM (16 years ago)

Author:

boonebgorges

Message:

Fixes PHP warnings in setup wizard

File:

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

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

@@ -893 +893 @@
 
                         // Make sure that the pages are created on the BP_ROOT_BLOG, no matter which Dashboard the setup is being run on
-                        if ( $current_blog->blog_id != BP_ROOT_BLOG && !defined( 'BP_ENABLE_MULTIBLOG' ) )
+                        if ( !empty( $current_blog->blog_id ) && $current_blog->blog_id != BP_ROOT_BLOG && !defined( 'BP_ENABLE_MULTIBLOG' ) )
                                 switch_to_blog( BP_ROOT_BLOG );
 
@@ -906 +906 @@
                         update_option( 'bp-pages', $bp_pages );
 
-                        if ( $current_blog->blog_id != BP_ROOT_BLOG )
+                        if ( !empty( $current_blog->blog_id ) && $current_blog->blog_id != BP_ROOT_BLOG )
                                 restore_current_blog();