Changeset 7756 for trunk/bp-forums/deprecated/1.7.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/deprecated/1.7.php (modified) (3 diffs)

trunk/bp-forums/deprecated/1.7.php

@@ -55 +55 @@
 
 function bp_forums_bbpress_install( $location = '' ) {
-    global $wpdb, $bbdb, $bp;
+    global $wpdb, $bbdb;
 
     check_admin_referer( 'bp_forums_new_install_init' );
@@ -63 +63 @@
     }
 
+    $bp = buddypress();
+
     // Create the bb-config.php file
     $initial_write = bp_forums_bbpress_write(
-        BP_PLUGIN_DIR . '/bp-forums/bbpress/bb-config-sample.php',
+        $bp->plugin_dir . '/bp-forums/bbpress/bb-config-sample.php',
         $location,
         array(
@@ -97 +99 @@
     $file .= "\n" .   '$bb->custom_user_table = \'' . $wpdb->users . '\';';
     $file .= "\n" .   '$bb->custom_user_meta_table = \'' . $wpdb->usermeta . '\';';
-    $file .= "\n\n" . '$bb->uri = \'' . BP_PLUGIN_URL . '/bp-forums/bbpress/\';';
+    $file .= "\n\n" . '$bb->uri = \'' . $bp->plugin_url . '/bp-forums/bbpress/\';';
     $file .= "\n" .   '$bb->name = \'' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . ' ' . __( 'Forums', 'buddypress' ) . '\';';