Changeset 4107

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

Location:

trunk

Files:

• bp-blogs/bp-blogs-functions.php (modified) (4 diffs)
• bp-blogs/bp-blogs-widgets.php (modified) (1 diff)
• bp-core/admin/bp-core-admin.php (modified) (3 diffs)
• bp-core/admin/bp-core-update.php (modified) (7 diffs)
• bp-core/bp-core-avatars.php (modified) (4 diffs)
• bp-core/bp-core-catchuri.php (modified) (2 diffs)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-core/bp-core-filters.php (modified) (2 diffs)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-core/bp-core-template.php (modified) (1 diff)
• bp-members/bp-members-buddybar.php (modified) (2 diffs)
• bp-members/bp-members-template.php (modified) (2 diffs)

trunk/bp-blogs/bp-blogs-functions.php

@@ -265 +265 @@
 
 function bp_blogs_add_user_to_blog( $user_id, $role = false, $blog_id = 0 ) {
-    global $wpdb, $current_blog;
-
-    if ( empty( $blog_id ) && isset( $current_blog ) )
-        $blog_id = $current_blog->blog_id;
+    global $wpdb;
+
+    if ( empty( $blog_id ) && isset( $wpdb->blogid ) )
+        $blog_id = $wpdb->blogid;
     else
         $blog_id = BP_ROOT_BLOG;
@@ -291 +291 @@
 
 function bp_blogs_remove_user_from_blog( $user_id, $blog_id = 0 ) {
-    global $current_blog;
+    global $wpdb;
 
     if ( empty( $blog_id ) )
-        $blog_id = $current_blog->blog_id;
+        $blog_id = $wpdb->blogid;
 
     bp_blogs_remove_blog_for_user( $user_id, $blog_id );
@@ -330 +330 @@
 
 function bp_blogs_remove_post( $post_id, $blog_id = 0, $user_id = 0 ) {
-    global $current_blog, $bp;
-
-    if ( empty( $current_blog->blog_id ) )
+    global $wpdb, $bp;
+
+    if ( empty( $wpdb->blogid ) )
         return false;
 
@@ -338 +338 @@
 
     if ( !$blog_id )
-        $blog_id = (int)$current_blog->blog_id;
+        $blog_id = (int)$wpdb->blogid;
 
     if ( !$user_id )

trunk/bp-blogs/bp-blogs-widgets.php

@@ -7 +7 @@
 
 function bp_blogs_register_widgets() {
-    global $current_blog, $bp;
+    global $wpdb, $bp;
 
-    if ( bp_is_active( 'activity' ) && (int)$current_blog->blog_id == BP_ROOT_BLOG )
+    if ( bp_is_active( 'activity' ) && (int)$wpdb->blogid == BP_ROOT_BLOG )
         add_action('widgets_init', create_function('', 'return register_widget("BP_Blogs_Recent_Posts_Widget");') );
 }

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 );

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;
 

trunk/bp-core/bp-core-avatars.php

@@ -564 +564 @@
  * Returns the absolute upload path for the WP installation
  *
- * @global object $current_blog Current blog information
+ * @global object $wpdb WordPress database global
  * @uses wp_upload_dir To get upload directory info
  * @return string Absolute path to WP upload directory
  */
 function bp_core_avatar_upload_path() {
-    global $current_blog;
+    global $wpdb;
 
     // Get upload directory information from current site
@@ -579 +579 @@
 
         // If multisite, and current blog does not match root blog, make adjustments
-        if ( is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
+        if ( is_multisite() && BP_ROOT_BLOG != $wpdb->blogid )
             $basedir = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
     } else {
@@ -593 +593 @@
  * Returns the raw base URL for root site upload location
  *
- * @global object $current_blog Current blog information
+ * @global object $wpdb WordPress database global
  * @uses wp_upload_dir To get upload directory info
  * @return string Full URL to current upload location
  */
 function bp_core_avatar_url() {
-    global $current_blog;
+    global $wpdb;
 
     // Get upload directory information from current site
@@ -608 +608 @@
 
         // If multisite, and current blog does not match root blog, make adjustments
-        if ( is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
+        if ( is_multisite() && BP_ROOT_BLOG != $wpdb->blogid )
             $baseurl = trailingslashit( get_blog_option( BP_ROOT_BLOG, 'home' ) ) . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
     } else {

trunk/bp-core/bp-core-catchuri.php

@@ -28 +28 @@
 function bp_core_set_uri_globals() {
     global $bp, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
-    global $current_blog;
+    global $current_blog, $wpdb;
 
     // Create global component, action, and item variables
@@ -37 +37 @@
     // on multiple blogs
     if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() ) {
-        if ( BP_ROOT_BLOG != (int) $current_blog->blog_id )
+        if ( BP_ROOT_BLOG != (int) $wpdb->blogid )
             return false;
     }

trunk/bp-core/bp-core-cssjs.php

@@ -33 +33 @@
 
 function bp_core_confirmation_js() {
-    global $current_blog;
+    global $wpdb;
 
-    if ( is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
+    if ( is_multisite() && $wpdb->blogid != BP_ROOT_BLOG )
         return false;
 

trunk/bp-core/bp-core-filters.php

@@ -68 +68 @@
  */
 function bp_core_allow_default_theme( $themes ) {
-    global $bp, $current_blog;
+    global $bp, $wpdb;
 
     if ( !is_super_admin() )
         return $themes;
 
-    if ( $current_blog->blog_id == BP_ROOT_BLOG ) {
+    if ( $wpdb->blogid == BP_ROOT_BLOG ) {
         $themes['bp-default'] = 1;
     }
-
+    
     return $themes;
 }
@@ -126 +126 @@
  */
 function bp_core_login_redirect( $redirect_to ) {
-    global $bp, $current_blog;
-
-    if ( is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
+    global $bp, $wpdb;
+
+    if ( is_multisite() && $wpdb->blogid != BP_ROOT_BLOG )
         return $redirect_to;
 

trunk/bp-core/bp-core-functions.php

@@ -169 +169 @@
  */
 function bp_core_get_root_domain() {
-    global $current_blog;
+    global $wpdb;
 
     if ( defined( 'BP_ENABLE_MULTIBLOG' ) )
-        $domain = get_home_url( $current_blog->blog_id );
+        $domain = get_home_url( $wpdb->blogid );
     else
         $domain = get_home_url( BP_ROOT_BLOG );

trunk/bp-core/bp-core-template.php

@@ -219 +219 @@
 
 function bp_get_page_title() {
-    global $bp, $post, $wp_query, $current_blog;
+    global $bp, $post, $wp_query;
 
     // Home

trunk/bp-members/bp-members-buddybar.php

@@ -42 +42 @@
 // **** "Blog Authors" Menu (visible when not logged in) ********
 function bp_adminbar_authors_menu() {
-    global $bp, $current_blog, $wpdb;
+    global $bp, $wpdb;
 
     // Only for multisite
@@ -49 +49 @@
 
     // Hide on root blog
-    if ( $current_blog->blog_id == BP_ROOT_BLOG || !bp_is_active( 'blogs' ) )
-        return false;
-
-    $blog_prefix = $wpdb->get_blog_prefix( $current_blog->blog_id );
+    if ( $wpdb->blogid == BP_ROOT_BLOG || !bp_is_active( 'blogs' ) )
+        return false;
+
+    $blog_prefix = $wpdb->get_blog_prefix( $wpdb->blogid );
     $authors     = $wpdb->get_results( "SELECT user_id, user_login, user_nicename, display_name, user_email, meta_value as caps FROM $wpdb->users u, $wpdb->usermeta um WHERE u.ID = um.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY um.user_id" );
 

trunk/bp-members/bp-members-template.php

@@ -604 +604 @@
 
 /**
- * bp_get_nav()
- * TEMPLATE TAG
- *
  * Uses the $bp->bp_nav global to render out the navigation within a BuddyPress install.
  * Each component adds to this navigation array within its own [component_name]_setup_nav() function.
@@ -622 +619 @@
  */
 function bp_get_loggedin_user_nav() {
-    global $bp, $current_blog;
+    global $bp;
 
     // Loop through each navigation item