Changeset 1267

Timestamp:

03/26/2009 03:11:09 PM (16 years ago)

Author:

apeatling

Message:

Fixes #627 props GIGALinux.

Location:

trunk

Files:

• bp-core.php (modified) (4 diffs)
• bp-core/bp-core-catchuri.php (modified) (1 diff)

trunk/bp-core.php

@@ -17 +17 @@
 if ( file_exists( WPMU_PLUGIN_DIR . '/bp-custom.php' ) )
     require( WPMU_PLUGIN_DIR . '/bp-custom.php' );
+
+/* Define on which blog ID BuddyPress should run */ 
+define( 'BP_ROOT_BLOG', apply_filters( 'bp_root_blog', 1 ) );
 
 /* Load the language file */
@@ -357 +360 @@
  */
 function bp_core_get_root_domain() {
-    switch_to_blog(1);
+    switch_to_blog(BP_ROOT_BLOG);
     $domain = site_url();
     restore_current_blog();
@@ -659 +662 @@
     
     if ( $uid == $userdata->ID )
-        return 'You';
+        return __( 'You', 'buddypress' );
     
     if ( !$ud = get_userdata($uid) )
@@ -1090 +1093 @@
  */
 function bp_core_get_site_path() {
-    global $wpdb;
-    
-    return $wpdb->get_var( $wpdb->prepare( "SELECT path FROM {$wpdb->base_prefix}site WHERE id = 1") );
+    global $current_site;
+    
+    return $current_site->path;
 }
 

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

@@ -34 +34 @@
     
     /* Only catch URI's on the root blog */
-    if ( 1 != (int) $current_blog->blog_id )
+    if ( BP_ROOT_BLOG != (int) $current_blog->blog_id )
         return false;