Changeset 2076 for branches/1.1/bp-forums/bp-forums-bbpress.php

Timestamp:

11/02/2009 06:56:42 PM (17 years ago)

Author:

apeatling

Message:

Merging last few trunk changes and stripping all whitespace.

File:

• branches/1.1/bp-forums/bp-forums-bbpress.php (modified) (10 diffs)

branches/1.1/bp-forums/bp-forums-bbpress.php

@@ -5 +5 @@
         global $bb, $bbdb, $bb_table_prefix, $bb_current_user;
         global $bb_roles, $wp_taxonomy_object;
-        
+
         /* Return if we've already run this function. */
         if ( is_object( $bbdb ) && is_object( $bb_roles ) )
                 return;
-        
+
         if ( !bp_forums_is_installed_correctly() )
                 return false;
-        
+
         define( 'BB_PATH', BP_PLUGIN_DIR . '/bp-forums/bbpress/' );
         define( 'BACKPRESS_PATH', BP_PLUGIN_DIR . '/bp-forums/bbpress/bb-includes/backpress/' );
@@ -20 +20 @@
         require_once( BB_PATH . BB_INC . 'class.bb-query.php' );
         require_once( BB_PATH . BB_INC . 'class.bb-walker.php' );
-        
+
         require_once( BB_PATH . BB_INC . 'functions.bb-core.php' );
         require_once( BB_PATH . BB_INC . 'functions.bb-forums.php' );
@@ -31 +31 @@
         require_once( BB_PATH . BB_INC . 'functions.bb-formatting.php' );
         require_once( BB_PATH . BB_INC . 'functions.bb-template.php' );
-        
+
         require_once( BACKPRESS_PATH . 'class.wp-taxonomy.php' );
         require_once( BB_PATH . BB_INC . 'class.bb-taxonomy.php' );
-        
+
         $bb = new stdClass();
         require_once( $bp->forums->bbconfig );
@@ -40 +40 @@
         // Setup the global database connection
         $bbdb = new BPDB ( BBDB_USER, BBDB_PASSWORD, BBDB_NAME, BBDB_HOST );
-        
+
         /* Set the table names */
         $bbdb->forums = $bb_table_prefix . 'forums';
@@ -49 +49 @@
         $bbdb->term_taxonomy = $bb_table_prefix . 'term_taxonomy';
         $bbdb->topics = $bb_table_prefix . 'topics';
-        
+
         if ( isset( $bb->custom_user_table ) )
                 $bbdb->users = $bb->custom_user_table;
         else
                 $bbdb->users = $wpdb->users;
-        
+
         if ( isset( $bb->custom_user_meta_table ) )
                 $bbdb->usermeta = $bb->custom_user_meta_table;
         else
                 $bbdb->usermeta = $wpdb->usermeta;
-                
+
         $bbdb->prefix = $bb_table_prefix;
 
@@ -67 +67 @@
         if ( !$tables_installed = (boolean) $bbdb->get_results( 'DESCRIBE `' . $bbdb->forums . '`;', ARRAY_A ) )
                 require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
-        
+
         require_once( BB_PATH . 'bb-admin/includes/functions.bb-admin.php' );
-        
+
         if ( is_object( $wp_roles ) ) {
                 $bb_roles =& $wp_roles;
@@ -84 +84 @@
         if ( !isset( $wp_taxonomy_object ) )
                 $wp_taxonomy_object = new BB_Taxonomy( $bbdb );
-        
+
         $wp_taxonomy_object->register_taxonomy( 'bb_topic_tag', 'bb_topic' );
 
@@ -96 +96 @@
 
                 dbDelta( $bb_queries );
-                
+
                 require_once( BB_PATH . 'bb-admin/includes/functions.bb-upgrade.php' );
                 bb_update_db_version();
-                
+
                 /* Set the site admins as the keymasters */
                 $site_admins = get_site_option( 'site_admins', array('admin') );
@@ -107 +107 @@
                 // Create the first forum.
                 bb_new_forum( array( 'forum_name' => 'Default Forum' ) );
-                
+
                 // Set the site URI
                 bb_update_option( 'uri', BB_URL );
@@ -129 +129 @@
                 $args = wp_parse_args( $args, $defaults );
                 extract( $args, EXTR_SKIP );
-                
+
                 return update_usermeta( $id, $meta_key, $meta_value );
         }