Index: bp-core/bp-core-buddybar.php
===================================================================
--- bp-core/bp-core-buddybar.php	(revision 4020)
+++ bp-core/bp-core-buddybar.php	(working copy)
@@ -450,8 +450,10 @@
 		// TODO: Add BP support to WP admin bar
 		return;
 	} elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
-		// Keep the WP admin bar from loading
-		show_admin_bar( false );
+		// Keep the WP admin bar from loading 3.1+
+		if ( function_exists('show_admin_bar') ) {
+			show_admin_bar( false );
+		}
 
 		// Actions used to build the BP admin bar
 		add_action( 'bp_adminbar_logo',  'bp_adminbar_logo' );