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

Timestamp:

03/11/2011 06:02:47 PM (14 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-admin.php (modified) (3 diffs)

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

@@ -19 +19 @@
  */
 function bp_core_activation_notice() {
-    global $wp_rewrite, $current_blog, $bp;
+    global $wp_rewrite, $wpdb, $bp;
 
     if ( isset( $_POST['permalink_structure'] ) )
@@ -27 +27 @@
         return false;
 
-    if ( !empty( $current_blog ) ) {
-        if ( $current_blog->blog_id != BP_ROOT_BLOG ) {
+    if ( !empty( $wpdb->blogid ) ) {
+        if ( $wpdb->blogid != BP_ROOT_BLOG ) {
             return false;
         }
@@ -91 +91 @@
  */
 function bp_core_admin_settings() {
-    global $wpdb, $bp, $current_blog;
+    global $wpdb, $bp;
 
     $ud = get_userdata( $bp->loggedin_user->id );