Changeset 7756 for trunk/bp-forums/bp-forums-bbpress-sa.php

Timestamp:

01/24/2014 11:48:48 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Replace BP_PLUGIN_DIR and BP_PLUGIN_URL constant usages with plugin_dir and plugin_url BuddyPress variables, respectively. Also replaces $bp global touches with buddypress() calls within the above scopes.

File:

• trunk/bp-forums/bp-forums-bbpress-sa.php (modified) (2 diffs)

trunk/bp-forums/bp-forums-bbpress-sa.php

@@ -16 +16 @@
  */
 function bp_forums_load_bbpress() {
-    global $bp, $wpdb, $wp_roles, $current_user, $wp_users_object;
+    global $wpdb, $wp_roles, $current_user, $wp_users_object;
     global $bb, $bbdb, $bb_table_prefix, $bb_current_user;
     global $bb_roles, $wp_taxonomy_object, $bb_queries;
-
+    
     // Return if we've already run this function.
     if ( is_object( $bbdb ) )
@@ -27 +27 @@
         return false;
 
-    define( 'BB_PATH', BP_PLUGIN_DIR . '/bp-forums/bbpress/' );
-    define( 'BACKPRESS_PATH', BP_PLUGIN_DIR . '/bp-forums/bbpress/bb-includes/backpress/' );
-    define( 'BB_URL', BP_PLUGIN_URL . 'bp-forums/bbpress/' );
+    $bp = buddypress();
+
+    define( 'BB_PATH',        $bp->plugin_dir . '/bp-forums/bbpress/' );
+    define( 'BACKPRESS_PATH', $bp->plugin_dir . '/bp-forums/bbpress/bb-includes/backpress/' );
+    define( 'BB_URL',         $bp->plugin_url . 'bp-forums/bbpress/' );
     define( 'BB_INC', 'bb-includes/' );