Index: trunk/bp-themes/bp-default/functions.php
===================================================================
--- trunk/bp-themes/bp-default/functions.php	(revision 2217)
+++ trunk/bp-themes/bp-default/functions.php	(working copy)
@@ -54,6 +54,12 @@
 		return $fullname[0];
 }
 
+<<<<<<< .mine
+function bp_dtheme_warn_deactivated() {
+	echo "<div class='updated fade'><h3>" . __( 'BuddyPress is not active, please change themes', 'buddypress') .  "</h3></div>";
+}
+
+=======
 function bp_dtheme_add_blog_comments_js() {
 	if ( is_singular() ) wp_enqueue_script( 'comment-reply' );
 }
@@ -101,12 +107,17 @@
 <?php
 }
 
+>>>>>>> .r2205
 function bp_dtheme_remove_redundant() {
 	global $bp;
 
 	/* Remove the redundant "My Posts and My Comments" options since we can use filters on the activity stream. */
-	bp_core_remove_subnav_item( $bp->blogs->slug, 'recent-posts' );
-	bp_core_remove_subnav_item( $bp->blogs->slug, 'recent-comments' );
+	if( isset( $bp ) ) {
+		bp_core_remove_subnav_item( $bp->blogs->slug, 'recent-posts' );
+		bp_core_remove_subnav_item( $bp->blogs->slug, 'recent-comments' );
+	} elseif( is_admin( ) ) {
+		add_action( 'admin_notices', 'bp_dtheme_warn_deactivated' );
+	}
 }
 add_action( 'init', 'bp_dtheme_remove_redundant' );
 
Index: trunk/bp-core/bp-core-wpabstraction.php
===================================================================
--- trunk/bp-core/bp-core-wpabstraction.php	(revision 2217)
+++ trunk/bp-core/bp-core-wpabstraction.php	(working copy)
@@ -28,24 +28,6 @@
 		return "{$prefix}spam = 0 AND {$prefix}deleted = 0 AND {$prefix}user_status = 0";
 }
 
-if ( !function_exists( 'get_site_option' ) ) {
-	function get_site_option( $option_value ) {
-		return get_option( $option_value );
-	}
-}
-
-if ( !function_exists( 'add_site_option' ) ) {
-	function add_site_option( $option_name, $option_value ) {
-		return add_option( $option_name, $option_value );
-	}
-}
-
-if ( !function_exists( 'update_site_option' ) ) {
-	function update_site_option( $option_name, $option_value ) {
-		return update_option( $option_name, $option_value );
-	}
-}
-
 if ( !function_exists( 'get_blog_option' ) ) {
 	function get_blog_option( $blog_id, $option_name ) {
 		return get_option( $option_name );