Changeset 3186 for branches/1.2/bp-core.php

Timestamp:

08/12/2010 06:33:05 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2561 props wpmuguru

File:

• branches/1.2/bp-core.php (modified) (12 diffs)

branches/1.2/bp-core.php

@@ -85 +85 @@
  */
 function bp_core_setup_globals() {
-    global $bp, $wpdb;
+    global $bp;
     global $current_user, $current_component, $current_action, $current_blog;
     global $displayed_user_id;
@@ -91 +91 @@
 
     $current_user = wp_get_current_user();
+
+    /* Get the base database prefix */
+    $bp->table_prefix = bp_core_get_table_prefix();
 
     /* The domain for the root of the site where the main blog resides */
@@ -154 +157 @@
 
     /* Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar */
-    $bp->grav_default->user = apply_filters( 'bp_user_gravatar_default', $bp->site_options['user-avatar-default'] );
+    $bp->grav_default->user  = apply_filters( 'bp_user_gravatar_default', $bp->site_options['user-avatar-default'] );
     $bp->grav_default->group = apply_filters( 'bp_group_gravatar_default', 'identicon' );
-    $bp->grav_default->blog = apply_filters( 'bp_blog_gravatar_default', 'identicon' );
+    $bp->grav_default->blog  = apply_filters( 'bp_blog_gravatar_default', 'identicon' );
 
     /* Fetch the full name for the logged in and current user */
-    $bp->loggedin_user->fullname = bp_core_get_user_displayname( $bp->loggedin_user->id );
+    $bp->loggedin_user->fullname  = bp_core_get_user_displayname( $bp->loggedin_user->id );
     $bp->displayed_user->fullname = bp_core_get_user_displayname( $bp->displayed_user->id );
 
@@ -171 +174 @@
     $bp->is_item_mod = false;
 
-    $bp->core->table_name_notifications = $wpdb->base_prefix . 'bp_notifications';
+    $bp->core->table_name_notifications = $bp->table_prefix . 'bp_notifications';
 
     if ( !$bp->current_component && $bp->displayed_user->id )
@@ -199 +202 @@
 add_action( 'bp_setup_root_components', 'bp_core_setup_root_uris' );
 
+/**
+ * bp_core_get_table_prefix()
+ *
+ * Allow filtering of database prefix. Intended for use in multinetwork installations.
+ *
+ * @global object $wpdb WordPress database object
+ * @return string Filtered database prefix
+ */
+function bp_core_get_table_prefix() {
+    global $wpdb;
+
+    return apply_filters( 'bp_core_get_table_prefix', $wpdb->base_prefix );
+}
 
 /**
@@ -252 +268 @@
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @global $wpdb WordPress DB access object.
  * @global $current_user WordPress global variable containing current logged in user information
  * @uses is_site_admin() returns true if the current user is a site admin, false if not
@@ -259 +274 @@
  */
 function bp_core_check_installed() {
-    global $wpdb, $bp;
+    global $bp;
 
     if ( !is_site_admin() )
@@ -279 +294 @@
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @global $wpdb WordPress DB access object.
  * @uses is_site_admin() returns true if the current user is a site admin, false if not
  * @uses add_submenu_page() WP function to add a submenu item
@@ -934 +948 @@
  * @package BuddyPress Core
  * @param $username str Username to check.
- * @global $wpdb WordPress DB access object.
  * @return false on no match
  * @return int the user ID of the matched user.
@@ -976 +989 @@
  * @package BuddyPress Core
  * @param $username str Username to check.
- * @global $wpdb WordPress DB access object.
  * @return false on no match
  * @return int the user ID of the matched user.
  */
 function bp_core_get_random_member() {
-    global $bp, $wpdb;
+    global $bp;
 
     if ( isset( $_GET['random-member'] ) ) {
@@ -1709 +1721 @@
  */
 function bp_core_delete_account( $user_id = false ) {
-    global $bp, $wpdb, $wp_version;
+    global $bp, $wp_version;
 
     if ( !$user_id )
@@ -1843 +1855 @@
  */
 function bp_core_print_generation_time() {
-    global $wpdb;
-    ?>
+?>
 
 <!-- Generated in <?php timer_stop(1); ?> seconds. -->