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

Timestamp:

03/11/2011 06:02:47 PM (15 years ago)

Author:

boonebgorges

Message:

Audit of the use of ->blog_id to change to ->blogid where possible, to better account for switch_to_blog() use. Fixes #2984. Props wpmuguru

File:

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

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

@@ -740 +740 @@
 
         function step_ms_update_save() {
-                global $current_blog;
+                global $wpdb;
 
                 if ( isset( $_POST['submit'] ) ) {
@@ -762 +762 @@
                         } else {
                                 // 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 ( $wpdb->blogid != BP_ROOT_BLOG && !defined( 'BP_ENABLE_MULTIBLOG' ) )
                                         switch_to_blog( BP_ROOT_BLOG );
 
@@ -771 +771 @@
                                 update_option( 'bp-pages', $bp_pages );
 
-                                if ( $current_blog->blog_id != BP_ROOT_BLOG )
+                                if ( $wpdb->blogid != BP_ROOT_BLOG )
                                         restore_current_blog();
 
@@ -810 +810 @@
 
         function step_pages_save() {
-                global $current_blog;
+                global $wpdb;
 
                 if ( isset( $_POST['submit'] ) && isset( $_POST['bp_pages'] ) ) {
@@ -816 +816 @@
 
                         // Make sure that the pages are created on the BP_ROOT_BLOG, no matter which Dashboard the setup is being run on
-                        if ( !empty( $current_blog->blog_id ) && $current_blog->blog_id != BP_ROOT_BLOG && !defined( 'BP_ENABLE_MULTIBLOG' ) )
+                        if ( !empty( $wpdb->blogid ) && $wpdb->blogid != BP_ROOT_BLOG && !defined( 'BP_ENABLE_MULTIBLOG' ) )
                                 switch_to_blog( BP_ROOT_BLOG );
 
@@ -829 +829 @@
                         update_option( 'bp-pages', $bp_pages );
 
-                        if ( !empty( $current_blog->blog_id ) && $current_blog->blog_id != BP_ROOT_BLOG )
+                        if ( !empty( $wpdb->blogid ) && $wpdb->blogid != BP_ROOT_BLOG )
                                 restore_current_blog();
 
@@ -853 +853 @@
                                         $permalink_structure = preg_replace( '#/+#', '/', '/' . $_POST['permalink_structure'] );
 
-                                if ( ( defined( 'VHOST' ) && constant( 'VHOST' ) == 'no' ) && $permalink_structure != '' && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path )
+                                if ( ( defined( 'VHOST' ) && constant( 'VHOST' ) == 'no' ) && $permalink_structure != '' && $current_site->domain . $current_site->path == $current_blog->domain . $current_blog->path )
                                         $permalink_structure = '/blog' . $permalink_structure;