Add current_theme_supports('buddypress') and other changes.

-Add bp-default check and current_theme_supports('buddypress') before TPack loads. Fixes #15.
-Add add_theme_support('buddypress') to bp_tpack_theme_setup().
-Move localization to loader.php
-Add missing @SInCE PHPDoc to bpt-admin.php.

bpt-admin.php

@@ -13,6 +13,8 @@
 
 /**
  * When BPT is deactivated, remove a few options from the DB
+ *
+ * @since 1.0
  */
 function bp_tpack_deactivate() {
 	/* Cleanup */
@@ -24,22 +26,18 @@ function bp_tpack_deactivate() {
 
 /**
  * Adds the BPT admin page under the "Themes" menu.
+ *
+ * @since 1.0
  */
 function bp_tpack_add_theme_menu() {
 	add_theme_page( __( 'BP Compatibility', 'bp-tpack' ), __( 'BP Compatibility', 'bp-tpack' ), 'switch_themes', 'bp-tpack-options', 'bp_tpack_theme_menu' );
 }
 add_action( 'admin_menu', 'bp_tpack_add_theme_menu' );
 
-/**
- * Loads custom language file.
- */
-function bp_tpack_load_language() {
-	load_plugin_textdomain( 'bp-tpack', false, dirname( plugin_basename( __FILE__ ) ) . '/lang/' );
-}
-add_action( 'plugins_loaded', 'bp_tpack_load_language', 9 );
-
 /**
  * Adds an admin notice if BPT hasn't been setup yet.
+ *
+ * @since 1.1
  */
 function bp_tpack_admin_notices() {
 	global $wp_version;
@@ -71,6 +69,8 @@ function bp_tpack_admin_notices() {
 
 /**
  * Output the BPT admin page
+ *
+ * @since 1.0
  */
 function bp_tpack_theme_menu() {
 	if ( !empty( $_GET['finish'] ) )
@@ -328,6 +328,7 @@ function bp_tpack_theme_menu() {
  * Function to copy over bp-default's main templates to the current WP theme
  *
  * @uses bp_tpack_recurse_copy()
+ * @since 1.0
  */
 function bp_tpack_move_templates() {
 	$destination_dir = get_stylesheet_directory() . '/';
@@ -347,7 +348,7 @@ function bp_tpack_move_templates() {
  * Removes the "you'll need to activate a BuddyPress-compatible theme" message from the admin when
  * the plugin is up and running successfully
  *
- * @since 1.3
+ * @since 1.2
  */
 function bp_tpack_remove_compatibility_message() {
 	global $bp;
@@ -377,6 +378,7 @@ function bp_tpack_remove_compatibility_message() {
  * @param string $src Location of source directory to copy
  * @param string $dst Location of destination directory where the copied files should reside
  * @see bp_tpack_move_templates()
+ * @since 1.0
  */
 function bp_tpack_recurse_copy( $src, $dst ) {
 	$dir = @opendir( $src );

bpt-functions.php

@@ -12,10 +12,6 @@
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 
-// Check to make sure the active theme is not bp-default
-if ( 'bp-default' == get_option( 'template' ) )
-	return;
-
 /**
  * Sets up WordPress theme for BuddyPress support.
  *
@@ -28,7 +24,10 @@ function bp_tpack_theme_setup() {
 	if ( ! (int)get_option( 'bp_tpack_disable_js' ) || ! function_exists( 'bp_dtheme_ajax_querystring' ) )
 		require_once( BP_PLUGIN_DIR . '/bp-themes/bp-default/_inc/ajax.php' );
 
-	if ( !is_admin() ) {
+	// Let's tell BP that we support it!
+	add_theme_support( 'buddypress' );
+
+	if ( ! is_admin() ) {
 		// Register buttons for the relevant component templates
 		// Friends button
 		if ( bp_is_active( 'friends' ) )

loader.php

@@ -20,13 +20,34 @@
 
 /**
  * Initialize the plugin once BuddyPress has initialized.
+ *
+ * @since 1.1
  */
 function bp_tpack_loader() {
+	// Check if the current theme supports BuddyPress or if the current theme is using bp-default
+	// If so, stop now!
+	if ( current_theme_supports( 'buddypress' ) || 'bp-default' == get_option( 'template' ) ) {
+		add_action( 'admin_notices', function() {
+			echo '<div class="error"><p>' . __( "Hey! It looks like your theme already supports BuddyPress! This means you don't need BP Template Pack. To get rid of this notice, deactivate the BuddyPress Template Pack plugin.", 'bp-tpack' ) . '</p></div>';
+		} );
+		return;
+	}
+
 	if ( is_admin() )
 		include( dirname( __FILE__ ) . '/bpt-admin.php' );
 
 	include( dirname( __FILE__ ) . '/bpt-functions.php' );
 }
 add_action( 'bp_include', 'bp_tpack_loader' );
 
+/**
+ * Localize the plugin.
+ *
+ * @since 1.2
+ */
+function bp_tpack_load_language() {
+	load_plugin_textdomain( 'bp-tpack', false, dirname( plugin_basename( __FILE__ ) ) . '/lang/' );
+}
+add_action( 'plugins_loaded', 'bp_tpack_load_language' );
+
 ?>