Changeset 3946 for trunk/bp-loader.php

Timestamp:

01/27/2011 06:37:49 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Prevent bp-loader.php from throwing notices if it is included more than once.

File:

• trunk/bp-loader.php (modified) (5 diffs)

trunk/bp-loader.php

@@ -11 +11 @@
 /** Constants *****************************************************************/
 
-define( 'BP_VERSION', '1.3-bleeding' );
-define( 'BP_DB_VERSION', 3605 );
+// Define the BuddyPress version
+if ( !defined( 'BP_VERSION' ) )
+    define( 'BP_VERSION', '1.3-bleeding' );
+
+// Define the database version
+if ( !defined( 'BP_DB_VERSION' ) )
+    define( 'BP_DB_VERSION', 3605 );
 
 // Define on which blog ID BuddyPress should run
@@ -19 +24 @@
 
 // Path and URL
-define( 'BP_PLUGIN_DIR', WP_PLUGIN_DIR . '/buddypress' );
-define( 'BP_PLUGIN_URL', plugins_url( $path = '/buddypress' ) );
+if ( !defined( 'BP_PLUGIN_DIR' ) )
+    define( 'BP_PLUGIN_DIR', WP_PLUGIN_DIR . '/buddypress' );
+
+if ( !defined( 'BP_PLUGIN_URL' ) )
+    define( 'BP_PLUGIN_URL', plugins_url( $path = '/buddypress' ) );
 
 // Load the WP abstraction file so BuddyPress can run on all WordPress setups.
-require ( BP_PLUGIN_DIR . '/bp-core/bp-core-wpabstraction.php' );
+require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-wpabstraction.php' );
 
 // Place your custom code (actions/filters) in a file called
 // '/plugins/bp-custom.php' and it will be loaded before anything else.
 if ( file_exists( WP_PLUGIN_DIR . '/bp-custom.php' ) )
-    require( WP_PLUGIN_DIR . '/bp-custom.php' );
+    require_once( WP_PLUGIN_DIR . '/bp-custom.php' );
 
 // Define the user and usermeta table names, useful if you are using custom or shared tables.
@@ -45 +53 @@
 require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-bootstrap.php' );
 
-/** 
+if ( !function_exists( 'bp_loader_activate' ) ) :
+/**
  * Defines BP's activation routine. 
  * 
@@ -69 +78 @@
 }
 register_activation_hook( 'buddypress/bp-loader.php', 'bp_loader_activate' );
+endif;
 
+if ( !function_exists( 'bp_loader_deactivate' ) ) :
 // Deactivation Function
 function bp_loader_deactivate() {
@@ -75 +86 @@
 }
 register_deactivation_hook( 'buddypress/bp-loader.php', 'bp_loader_deactivate' );
+endif;
 
 ?>