Index: bp-core.php
===================================================================
--- bp-core.php	(Revision 1263)
+++ bp-core.php	(Arbeitskopie)
@@ -16,6 +16,9 @@
 /* Place your custom code (actions/filters) in a file called bp-custom.php and it will be loaded before anything else. */
 if ( file_exists( WPMU_PLUGIN_DIR . '/bp-custom.php' ) )
 	require( WPMU_PLUGIN_DIR . '/bp-custom.php' );
+	
+/* On which blog BuddyPress runs */
+define( 'BP_ROOT_BLOG', apply_filters( 'bp_root_blog', 3 ) );
 
 /* Load the language file */
 if ( file_exists( WPMU_PLUGIN_DIR . '/bp-languages/buddypress-' . get_locale() . '.mo' ) )
@@ -73,6 +76,9 @@
 	global $action_variables;
 	
 	$current_user = wp_get_current_user();
+	
+	/* The blog id of the BuddyPress installation */
+	$bp->root_id = BP_ROOT_BLOG;
 
 	/* The domain for the root of the site where the main blog resides */	
 	$bp->root_domain = bp_core_get_root_domain();
@@ -356,7 +362,7 @@
  * @return $domain The domain URL for the blog.
  */
 function bp_core_get_root_domain() {
-	switch_to_blog(1);
+	switch_to_blog(BP_ROOT_BLOG);
 	$domain = site_url();
 	restore_current_blog();
 	
@@ -658,7 +664,7 @@
 	global $userdata;
 	
 	if ( $uid == $userdata->ID )
-		return 'You';
+		return __( 'You', 'buddypress' );
 	
 	if ( !$ud = get_userdata($uid) )
 		return false;
@@ -1089,9 +1095,9 @@
  * @uses bp_core_get_userlink_by_email() Fetches a userlink via email address.
  */
 function bp_core_get_site_path() {
-	global $wpdb;
+	global $current_site;
 	
-	return $wpdb->get_var( $wpdb->prepare( "SELECT path FROM {$wpdb->base_prefix}site WHERE id = 1") );
+	return $current_site->path;
 }
 
 function bp_core_redirect( $location, $status = 302 ) {
Index: bp-core/bp-core-catchuri.php
===================================================================
--- bp-core/bp-core-catchuri.php	(Revision 1263)
+++ bp-core/bp-core-catchuri.php	(Arbeitskopie)
@@ -33,7 +33,7 @@
 	global $bp, $current_blog;
 	
 	/* 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;
 	
 	if ( strpos( $_SERVER['REQUEST_URI'], 'bp-core-ajax-handler.php' ) )