Changeset 5827

Timestamp:

07/14/2015 12:31:42 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Abstraction: Use bbp_db(), bbp_rewrite() & friends, introduced in r5823 & r5826.

This commit improves the stability of bbPress in the WordPress environment by reducing global variable exposure. It also comes with minimal opcode improvements in some circumstances where $GLOBALS is preferred over defining via global statements.

Some additional surrounding cleanup directly related to functions & methods being altered is also being performed here.

Fixes #2786.

Location:

trunk/src/includes

Files:

• admin/admin.php (modified) (7 diffs)
• admin/converter.php (modified) (3 diffs)
• admin/tools.php (modified) (71 diffs)
• common/functions.php (modified) (16 diffs)
• common/template.php (modified) (2 diffs)
• core/capabilities.php (modified) (6 diffs)
• core/theme-compat.php (modified) (1 diff)
• forums/functions.php (modified) (9 diffs)
• replies/functions.php (modified) (2 diffs)
• replies/template.php (modified) (9 diffs)
• search/functions.php (modified) (4 diffs)
• search/template.php (modified) (8 diffs)
• topics/functions.php (modified) (10 diffs)
• topics/template.php (modified) (13 diffs)
• users/capabilities.php (modified) (8 diffs)
• users/functions.php (modified) (14 diffs)
• users/template.php (modified) (15 diffs)

trunk/src/includes/admin/admin.php

@@ -693 +693 @@
          */
         public function suggest_topic() {
-                global $wpdb;
 
                 // Bail early if no request
@@ -710 +709 @@
                 // Try to get some topics
                 $topics = get_posts( array(
-                        's'         => $wpdb->esc_like( $_REQUEST['q'] ),
+                        's'         => bbp_db()->esc_like( $_REQUEST['q'] ),
                         'post_type' => bbp_get_topic_post_type()
                 ) );
@@ -729 +728 @@
          */
         public function suggest_user() {
-                global $wpdb;
 
                 // Bail early if no request
@@ -746 +744 @@
                 // Try to get some users
                 $users_query = new WP_User_Query( array(
-                        'search'         => '*' . $wpdb->esc_like( $_REQUEST['q'] ) . '*',
+                        'search'         => '*' . bbp_db()->esc_like( $_REQUEST['q'] ) . '*',
                         'fields'         => array( 'ID', 'user_nicename' ),
                         'search_columns' => array( 'ID', 'user_nicename', 'user_email' ),
@@ -948 +946 @@
          * @since bbPress (r3689)
          *
-         * @global WPDB $wpdb
          * @uses get_blog_option()
          * @uses wp_remote_get()
@@ -995 +992 @@
          * @since bbPress (r3689)
          *
-         * @global WPDB $wpdb
          * @uses get_blog_option()
          * @uses wp_remote_get()
          */
         public static function network_update_screen() {
-                global $wpdb;
+                $bbp_db = bbp_db();
 
                 // Get action
@@ -1019 +1015 @@
 
                                 // Get blogs 5 at a time
-                                $blogs = $wpdb->get_results( "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
+                                $blogs = $bbp_db->get_results( "SELECT * FROM {$bbp_db->blogs} WHERE site_id = '{$bbp_db->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
 
                                 // No blogs so all done!

trunk/src/includes/admin/converter.php

@@ -630 +630 @@
          */
         public function sync_table( $drop = false ) {
-                global $wpdb;
-
-                $table_name = $wpdb->prefix . 'bbp_converter_translator';
-                if ( ! empty( $drop ) && $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name ) {
-                        $wpdb->query( "DROP TABLE {$table_name}" );
+
+                $bbp_db     = bbp_db();
+                $table_name = $bbp_db->prefix . 'bbp_converter_translator';
+                if ( ! empty( $drop ) && $bbp_db->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name ) {
+                        $bbp_db->query( "DROP TABLE {$table_name}" );
                 }
 
                 require_once( ABSPATH . '/wp-admin/includes/upgrade.php' );
 
-                if ( !empty( $wpdb->charset ) ) {
-                        $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-                }
-
-                if ( !empty( $wpdb->collate ) ) {
-                        $charset_collate .= " COLLATE $wpdb->collate";
+                if ( !empty( $bbp_db->charset ) ) {
+                        $charset_collate = "DEFAULT CHARACTER SET $bbp_db->charset";
+                }
+
+                if ( !empty( $bbp_db->collate ) ) {
+                        $charset_collate .= " COLLATE $bbp_db->collate";
                 }
 
@@ -676 +676 @@
 
         /**
-         * @var object This is the connection to the WordPress datbase.
+         * @var object This is the connection to the WordPress database.
          */
         protected $wpdb;
@@ -740 +740 @@
 
         private function setup_globals() {
-                global $wpdb;
 
                 /** Get database connections ******************************************/
 
-                $this->wpdb         = $wpdb;
+                $this->wpdb         = bbp_db();
                 $this->max_rows     = (int) $_POST['_bbp_converter_rows'];
                 $this->opdb         = new wpdb( $_POST['_bbp_converter_db_user'], $_POST['_bbp_converter_db_pass'], $_POST['_bbp_converter_db_name'], $_POST['_bbp_converter_db_server'] );

trunk/src/includes/admin/tools.php

@@ -241 +241 @@
  */
 function bbp_admin_tools_feedback( $message, $class = false ) {
+
+        // Dismiss button
+        $dismiss = '<button type="button" class="notice-dismiss"><span class="screen-reader-text">' . __( 'Dismiss this notice.', 'bbpress' ) . '</span></button>';
+
+        // One message as string
         if ( is_string( $message ) ) {
                 $message = '<p>' . $message . '</p>';
-                $class = $class ? $class : 'updated';
+                $class   = $class ? $class : 'updated';
+
+        // Messages as objects
         } elseif ( is_wp_error( $message ) ) {
-                $errors = $message->get_error_messages();
+                $errors  = $message->get_error_messages();
 
                 switch ( count( $errors ) ) {
@@ -260 +267 @@
                 }
 
-                $class = $class ? $class : 'error';
+                $class = $class ? $class : 'is-error';
         } else {
                 return false;
         }
 
-        $message = '<div id="message" class="' . esc_attr( $class ) . '">' . $message . '</div>';
+        // Assemble the message
+        $message = '<div id="message" class="is-dismissible notice ' . esc_attr( $class ) . '">' . $message . $dismiss . '</div>';
         $message = str_replace( "'", "\'", $message );
+
+        // Ugh
         $lambda  = create_function( '', "echo '$message';" );
-
         add_action( 'admin_notices', $lambda );
 
@@ -323 +332 @@
  */
 function bbp_admin_repair_topic_reply_count() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Counting the number of replies in each topic&hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
@@ -335 +345 @@
 
         // Delete the meta key _bbp_reply_count for each topic
-        $sql_delete = "DELETE `postmeta` FROM `{$wpdb->postmeta}` AS `postmeta`
-                                                LEFT JOIN `{$wpdb->posts}` AS `posts` ON `posts`.`ID` = `postmeta`.`post_id`
+        $sql_delete = "DELETE `postmeta` FROM `{$bbp_db->postmeta}` AS `postmeta`
+                                                LEFT JOIN `{$bbp_db->posts}` AS `posts` ON `posts`.`ID` = `postmeta`.`post_id`
                                                 WHERE `posts`.`post_type` = '{$tpt}'
                                                 AND `postmeta`.`meta_key` = '_bbp_reply_count'";
 
-        if ( is_wp_error( $wpdb->query( $sql_delete ) ) ) {
+        if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
                 return array( 1, sprintf( $statement, $result ) );
         }
 
         // Recalculate the meta key _bbp_reply_count for each topic
-        $sql = "INSERT INTO `{$wpdb->postmeta}` (`post_id`, `meta_key`, `meta_value`) (
+        $sql = "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`) (
                         SELECT `topics`.`ID` AS `post_id`, '_bbp_reply_count' AS `meta_key`, COUNT(`replies`.`ID`) As `meta_value`
-                                FROM `{$wpdb->posts}` AS `topics`
-                                        LEFT JOIN `{$wpdb->posts}` as `replies`
+                                FROM `{$bbp_db->posts}` AS `topics`
+                                        LEFT JOIN `{$bbp_db->posts}` as `replies`
                                                 ON  `replies`.`post_parent` = `topics`.`ID`
                                                 AND `replies`.`post_status` = '{$pps}'
@@ -356 +366 @@
                                 GROUP BY `topics`.`ID`);";
 
-        if ( is_wp_error( $wpdb->query( $sql ) ) ) {
+        if ( is_wp_error( $bbp_db->query( $sql ) ) ) {
                 return array( 2, sprintf( $statement, $result ) );
         }
@@ -377 +387 @@
  */
 function bbp_admin_repair_topic_voice_count() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Counting the number of voices in each topic&hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
 
-        $sql_delete = "DELETE FROM `{$wpdb->postmeta}` WHERE `meta_key` = '_bbp_voice_count';";
-        if ( is_wp_error( $wpdb->query( $sql_delete ) ) ) {
+        $sql_delete = "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_voice_count';";
+        if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
                 return array( 1, sprintf( $statement, $result ) );
         }
@@ -393 +404 @@
         $cps = bbp_get_closed_status_id();
 
-        $sql = "INSERT INTO `{$wpdb->postmeta}` (`post_id`, `meta_key`, `meta_value`) (
+        $sql = "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`) (
                         SELECT `postmeta`.`meta_value`, '_bbp_voice_count', COUNT(DISTINCT `post_author`) as `meta_value`
-                                FROM `{$wpdb->posts}` AS `posts`
-                                LEFT JOIN `{$wpdb->postmeta}` AS `postmeta`
+                                FROM `{$bbp_db->posts}` AS `posts`
+                                LEFT JOIN `{$bbp_db->postmeta}` AS `postmeta`
                                         ON `posts`.`ID` = `postmeta`.`post_id`
                                         AND `postmeta`.`meta_key` = '_bbp_topic_id'
@@ -404 +415 @@
                                 GROUP BY `postmeta`.`meta_value`);";
 
-        if ( is_wp_error( $wpdb->query( $sql ) ) ) {
+        if ( is_wp_error( $bbp_db->query( $sql ) ) ) {
                 return array( 2, sprintf( $statement, $result ) );
         }
@@ -424 +435 @@
  */
 function bbp_admin_repair_topic_hidden_reply_count() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Counting the number of spammed and trashed replies in each topic&hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
 
-        $sql_delete = "DELETE FROM `{$wpdb->postmeta}` WHERE `meta_key` = '_bbp_reply_count_hidden';";
-        if ( is_wp_error( $wpdb->query( $sql_delete ) ) ) {
+        $sql_delete = "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_reply_count_hidden';";
+        if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
                 return array( 1, sprintf( $statement, $result ) );
         }
@@ -439 +451 @@
         $sps = bbp_get_spam_status_id();
 
-        $sql = "INSERT INTO `{$wpdb->postmeta}` (`post_id`, `meta_key`, `meta_value`) (SELECT `post_parent`, '_bbp_reply_count_hidden', COUNT(`post_status`) as `meta_value` FROM `{$wpdb->posts}` WHERE `post_type` = '{$rpt}' AND `post_status` IN ( '{$tps}', '{$sps}' ) GROUP BY `post_parent`);";
-        if ( is_wp_error( $wpdb->query( $sql ) ) ) {
+        $sql = "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`) (SELECT `post_parent`, '_bbp_reply_count_hidden', COUNT(`post_status`) as `meta_value` FROM `{$bbp_db->posts}` WHERE `post_type` = '{$rpt}' AND `post_status` IN ( '{$tps}', '{$sps}' ) GROUP BY `post_parent`);";
+        if ( is_wp_error( $bbp_db->query( $sql ) ) ) {
                 return array( 2, sprintf( $statement, $result ) );
         }
@@ -452 +464 @@
  * @since bbPress (r4395)
  *
- * @global WPDB $wpdb
  * @uses bbp_get_forum_post_type() To get the forum post type
  * @return If a wp_error() occurs and no converted forums are found
  */
 function bbp_admin_repair_group_forum_relationship() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Repairing BuddyPress group-forum relationships&hellip; %s', 'bbpress' );
-        $g_count     = 0;
-        $f_count     = 0;
-        $s_count     = 0;
+        $g_count   = 0;
+        $f_count   = 0;
+        $s_count   = 0;
 
         // Copy the BuddyPress filter here, incase BuddyPress is not active
-        $prefix            = apply_filters( 'bp_core_get_table_prefix', $wpdb->base_prefix );
+        $prefix            = apply_filters( 'bp_core_get_table_prefix', $bbp_db->base_prefix );
         $groups_table      = $prefix . 'bp_groups';
         $groups_meta_table = $prefix . 'bp_groups_groupmeta';
 
         // Get the converted forum IDs
-        $forum_ids = $wpdb->query( "SELECT `forum`.`ID`, `forummeta`.`meta_value`
-                                                                FROM `{$wpdb->posts}` AS `forum`
-                                                                        LEFT JOIN `{$wpdb->postmeta}` AS `forummeta`
+        $forum_ids = $bbp_db->query( "SELECT `forum`.`ID`, `forummeta`.`meta_value`
+                                                                FROM `{$bbp_db->posts}` AS `forum`
+                                                                        LEFT JOIN `{$bbp_db->postmeta}` AS `forummeta`
                                                                                 ON `forum`.`ID` = `forummeta`.`post_id`
                                                                                 AND `forummeta`.`meta_key` = '_bbp_old_forum_id'
@@ -479 +491 @@
 
         // Bail if forum IDs returned an error
-        if ( is_wp_error( $forum_ids ) || empty( $wpdb->last_result ) ) {
+        if ( is_wp_error( $forum_ids ) || empty( $bbp_db->last_result ) ) {
                 return array( 2, sprintf( $statement, __( 'Failed!', 'bbpress' ) ) );
         }
 
         // Stash the last results
-        $results = $wpdb->last_result;
+        $results = $bbp_db->last_result;
 
         // Update each group forum
@@ -495 +507 @@
 
                 // Attempt to update group meta
-                $updated = $wpdb->query( "UPDATE `{$groups_meta_table}` SET `meta_value` = '{$group_forums->ID}' WHERE `meta_key` = 'forum_id' AND `meta_value` = '{$group_forums->meta_value}';" );
+                $updated = $bbp_db->query( "UPDATE `{$groups_meta_table}` SET `meta_value` = '{$group_forums->ID}' WHERE `meta_key` = 'forum_id' AND `meta_value` = '{$group_forums->meta_value}';" );
 
                 // Bump the count
@@ -503 +515 @@
 
                 // Update group to forum relationship data
-                $group_id = (int) $wpdb->get_var( "SELECT `group_id` FROM `{$groups_meta_table}` WHERE `meta_key` = 'forum_id' AND `meta_value` = '{$group_forums->ID}';" );
+                $group_id = (int) $bbp_db->get_var( "SELECT `group_id` FROM `{$groups_meta_table}` WHERE `meta_key` = 'forum_id' AND `meta_value` = '{$group_forums->ID}';" );
                 if ( !empty( $group_id ) ) {
 
@@ -510 +522 @@
 
                         // Get the group status
-                        $group_status = $wpdb->get_var( "SELECT `status` FROM `{$groups_table}` WHERE `id` = '{$group_id}';" );
+                        $group_status = $bbp_db->get_var( "SELECT `status` FROM `{$groups_table}` WHERE `id` = '{$group_id}';" );
 
                         // Sync up forum visibility based on group status
@@ -597 +609 @@
  */
 function bbp_admin_repair_forum_topic_count() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Counting the number of topics in each forum&hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
 
-        $sql_delete = "DELETE FROM {$wpdb->postmeta} WHERE meta_key IN ( '_bbp_topic_count', '_bbp_total_topic_count', '_bbp_topic_count_hidden' );";
-        if ( is_wp_error( $wpdb->query( $sql_delete ) ) ) {
+        $sql_delete = "DELETE FROM {$bbp_db->postmeta} WHERE meta_key IN ( '_bbp_topic_count', '_bbp_total_topic_count', '_bbp_topic_count_hidden' );";
+        if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
                 return array( 1, sprintf( $statement, $result ) );
         }
@@ -633 +646 @@
  */
 function bbp_admin_repair_forum_reply_count() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Counting the number of replies in each forum&hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
@@ -642 +656 @@
 
         // Delete the meta keys _bbp_reply_count and _bbp_total_reply_count for each forum
-        $sql_delete = "DELETE `postmeta` FROM `{$wpdb->postmeta}` AS `postmeta`
-                                                LEFT JOIN `{$wpdb->posts}` AS `posts` ON `posts`.`ID` = `postmeta`.`post_id`
+        $sql_delete = "DELETE `postmeta` FROM `{$bbp_db->postmeta}` AS `postmeta`
+                                                LEFT JOIN `{$bbp_db->posts}` AS `posts` ON `posts`.`ID` = `postmeta`.`post_id`
                                                 WHERE `posts`.`post_type` = '{$fpt}'
                                                 AND `postmeta`.`meta_key` = '_bbp_reply_count'
                                                 OR `postmeta`.`meta_key` = '_bbp_total_reply_count'";
 
-        if ( is_wp_error( $wpdb->query( $sql_delete ) ) ) {
+        if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
                 return array( 1, sprintf( $statement, $result ) );
         }
@@ -677 +691 @@
  */
 function bbp_admin_repair_user_topic_count() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db      = bbp_db();
         $statement   = __( 'Counting the number of topics each user has created&hellip; %s', 'bbpress' );
         $result      = __( 'Failed!', 'bbpress' );
-        $sql_select  = "SELECT `post_author`, COUNT(DISTINCT `ID`) as `_count` FROM `{$wpdb->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "' GROUP BY `post_author`;";
-        $insert_rows = $wpdb->get_results( $sql_select );
+
+        $sql_select  = "SELECT `post_author`, COUNT(DISTINCT `ID`) as `_count` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "' GROUP BY `post_author`;";
+        $insert_rows = $bbp_db->get_results( $sql_select );
 
         if ( is_wp_error( $insert_rows ) ) {
@@ -688 +704 @@
         }
 
-        $key           = $wpdb->prefix . '_bbp_topic_count';
+        $key           = $bbp_db->prefix . '_bbp_topic_count';
         $insert_values = array();
         foreach ( $insert_rows as $insert_row ) {
@@ -698 +714 @@
         }
 
-        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';";
-        if ( is_wp_error( $wpdb->query( $sql_delete ) ) ) {
+        $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';";
+        if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
                 return array( 3, sprintf( $statement, $result ) );
         }
@@ -705 +721 @@
         foreach ( array_chunk( $insert_values, 10000 ) as $chunk ) {
                 $chunk = "\n" . implode( ",\n", $chunk );
-                $sql_insert = "INSERT INTO `{$wpdb->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES $chunk;";
-
-                if ( is_wp_error( $wpdb->query( $sql_insert ) ) ) {
+                $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk};";
+
+                if ( is_wp_error( $bbp_db->query( $sql_insert ) ) ) {
                         return array( 4, sprintf( $statement, $result ) );
                 }
@@ -727 +743 @@
  */
 function bbp_admin_repair_user_reply_count() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement   = __( 'Counting the number of topics to which each user has replied&hellip; %s', 'bbpress' );
         $result      = __( 'Failed!', 'bbpress' );
-        $sql_select  = "SELECT `post_author`, COUNT(DISTINCT `ID`) as `_count` FROM `{$wpdb->posts}` WHERE `post_type` = '" . bbp_get_reply_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "' GROUP BY `post_author`;";
-        $insert_rows = $wpdb->get_results( $sql_select );
+
+        $sql_select  = "SELECT `post_author`, COUNT(DISTINCT `ID`) as `_count` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_reply_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "' GROUP BY `post_author`;";
+        $insert_rows = $bbp_db->get_results( $sql_select );
 
         if ( is_wp_error( $insert_rows ) ) {
@@ -738 +756 @@
         }
 
-        $key           = $wpdb->prefix . '_bbp_reply_count';
+        $key           = $bbp_db->prefix . '_bbp_reply_count';
         $insert_values = array();
         foreach ( $insert_rows as $insert_row ) {
@@ -748 +766 @@
         }
 
-        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';";
-        if ( is_wp_error( $wpdb->query( $sql_delete ) ) ) {
+        $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';";
+        if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
                 return array( 3, sprintf( $statement, $result ) );
         }
@@ -755 +773 @@
         foreach ( array_chunk( $insert_values, 10000 ) as $chunk ) {
                 $chunk = "\n" . implode( ",\n", $chunk );
-                $sql_insert = "INSERT INTO `{$wpdb->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES $chunk;";
-
-                if ( is_wp_error( $wpdb->query( $sql_insert ) ) ) {
+                $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk};";
+
+                if ( is_wp_error( $bbp_db->query( $sql_insert ) ) ) {
                         return array( 4, sprintf( $statement, $result ) );
                 }
@@ -777 +795 @@
  */
 function bbp_admin_repair_user_favorites() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Removing trashed topics from user favorites&hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
-        $key       = $wpdb->prefix . '_bbp_favorites';
-        $users     = $wpdb->get_results( "SELECT `user_id`, `meta_value` AS `favorites` FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';" );
+
+        $key       = $bbp_db->prefix . '_bbp_favorites';
+        $users     = $bbp_db->get_results( "SELECT `user_id`, `meta_value` AS `favorites` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';" );
 
         if ( is_wp_error( $users ) ) {
@@ -788 +808 @@
         }
 
-        $topics = $wpdb->get_col( "SELECT `ID` FROM `{$wpdb->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "';" );
+        $topics = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "';" );
 
         if ( is_wp_error( $topics ) ) {
@@ -817 +837 @@
         }
 
-        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';";
-        if ( is_wp_error( $wpdb->query( $sql_delete ) ) ) {
+        $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';";
+        if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
                 return array( 4, sprintf( $statement, $result ) );
         }
@@ -824 +844 @@
         foreach ( array_chunk( $values, 10000 ) as $chunk ) {
                 $chunk = "\n" . implode( ",\n", $chunk );
-                $sql_insert = "INSERT INTO `$wpdb->usermeta` (`user_id`, `meta_key`, `meta_value`) VALUES $chunk;";
-                if ( is_wp_error( $wpdb->query( $sql_insert ) ) ) {
+                $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk};";
+                if ( is_wp_error( $bbp_db->query( $sql_insert ) ) ) {
                         return array( 5, sprintf( $statement, $result ) );
                 }
@@ -845 +865 @@
  */
 function bbp_admin_repair_user_topic_subscriptions() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Removing trashed topics from user subscriptions&hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
-        $key       = $wpdb->prefix . '_bbp_subscriptions';
-        $users     = $wpdb->get_results( "SELECT `user_id`, `meta_value` AS `subscriptions` FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';" );
+
+        $key       = $bbp_db->prefix . '_bbp_subscriptions';
+        $users     = $bbp_db->get_results( "SELECT `user_id`, `meta_value` AS `subscriptions` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';" );
 
         if ( is_wp_error( $users ) ) {
@@ -856 +878 @@
         }
 
-        $topics = $wpdb->get_col( "SELECT `ID` FROM `{$wpdb->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "';" );
+        $topics = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "';" );
         if ( is_wp_error( $topics ) ) {
                 return array( 2, sprintf( $statement, $result ) );
@@ -884 +906 @@
         }
 
-        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';";
-        if ( is_wp_error( $wpdb->query( $sql_delete ) ) ) {
+        $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';";
+        if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
                 return array( 4, sprintf( $statement, $result ) );
         }
@@ -891 +913 @@
         foreach ( array_chunk( $values, 10000 ) as $chunk ) {
                 $chunk = "\n" . implode( ",\n", $chunk );
-                $sql_insert = "INSERT INTO `{$wpdb->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES $chunk;";
-                if ( is_wp_error( $wpdb->query( $sql_insert ) ) ) {
+                $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk};";
+                if ( is_wp_error( $bbp_db->query( $sql_insert ) ) ) {
                         return array( 5, sprintf( $statement, $result ) );
                 }
@@ -912 +934 @@
  */
 function bbp_admin_repair_user_forum_subscriptions() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Removing trashed forums from user subscriptions&hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
-        $key       = $wpdb->prefix . '_bbp_forum_subscriptions';
-        $users     = $wpdb->get_results( "SELECT `user_id`, `meta_value` AS `subscriptions` FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';" );
+
+        $key       = $bbp_db->prefix . '_bbp_forum_subscriptions';
+        $users     = $bbp_db->get_results( "SELECT `user_id`, `meta_value` AS `subscriptions` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';" );
 
         if ( is_wp_error( $users ) ) {
@@ -923 +947 @@
         }
 
-        $forums = $wpdb->get_col( "SELECT `ID` FROM `{$wpdb->posts}` WHERE `post_type` = '" . bbp_get_forum_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "';" );
+        $forums = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_forum_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "';" );
         if ( is_wp_error( $forums ) ) {
                 return array( 2, sprintf( $statement, $result ) );
@@ -951 +975 @@
         }
 
-        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';";
-        if ( is_wp_error( $wpdb->query( $sql_delete ) ) ) {
+        $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';";
+        if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
                 return array( 4, sprintf( $statement, $result ) );
         }
@@ -958 +982 @@
         foreach ( array_chunk( $values, 10000 ) as $chunk ) {
                 $chunk = "\n" . implode( ",\n", $chunk );
-                $sql_insert = "INSERT INTO `{$wpdb->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES $chunk;";
-                if ( is_wp_error( $wpdb->query( $sql_insert ) ) ) {
+                $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk};";
+                if ( is_wp_error( $bbp_db->query( $sql_insert ) ) ) {
                         return array( 5, sprintf( $statement, $result ) );
                 }
@@ -999 +1023 @@
 
                 // If no role map exists, give the default forum role (bbp-participant)
-                $new_role = isset( $role_map[$role] ) ? $role_map[$role] : $default_role;
+                $new_role = isset( $role_map[ $role ] ) ? $role_map[ $role ] : $default_role;
 
                 // Get users of this site, limited to 1000
@@ -1022 +1046 @@
 
         $result = sprintf( __( 'Complete! %s users updated.', 'bbpress' ), bbp_number_format( $changed ) );
+
         return array( 0, sprintf( $statement, $result ) );
 }
@@ -1041 +1066 @@
  */
 function bbp_admin_repair_freshness() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Recomputing latest post in every topic and forum&hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
 
         // First, delete everything.
-        if ( is_wp_error( $wpdb->query( "DELETE FROM `$wpdb->postmeta` WHERE `meta_key` IN ( '_bbp_last_reply_id', '_bbp_last_topic_id', '_bbp_last_active_id', '_bbp_last_active_time' );" ) ) ) {
+        if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` IN ( '_bbp_last_reply_id', '_bbp_last_topic_id', '_bbp_last_active_id', '_bbp_last_active_time' );" ) ) ) {
                 return array( 1, sprintf( $statement, $result ) );
         }
@@ -1058 +1084 @@
 
         // Next, give all the topics with replies the ID their last reply.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `topic`.`ID`, '_bbp_last_reply_id', MAX( `reply`.`ID` )
-                        FROM `$wpdb->posts` AS `topic` INNER JOIN `$wpdb->posts` AS `reply` ON `topic`.`ID` = `reply`.`post_parent`
+                        FROM `{$bbp_db->posts}` AS `topic` INNER JOIN `{$bbp_db->posts}` AS `reply` ON `topic`.`ID` = `reply`.`post_parent`
                         WHERE `reply`.`post_status` = '{$pps}' AND `topic`.`post_type` = '{$tpt}' AND `reply`.`post_type` = '{$rpt}'
                         GROUP BY `topic`.`ID` );" ) ) ) {
@@ -1067 +1093 @@
 
         // For any remaining topics, give a reply ID of 0.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `ID`, '_bbp_last_reply_id', 0
-                        FROM `$wpdb->posts` AS `topic` LEFT JOIN `$wpdb->postmeta` AS `reply`
+                        FROM `{$bbp_db->posts}` AS `topic` LEFT JOIN `{$bbp_db->postmeta}` AS `reply`
                         ON `topic`.`ID` = `reply`.`post_id` AND `reply`.`meta_key` = '_bbp_last_reply_id'
                         WHERE `reply`.`meta_id` IS NULL AND `topic`.`post_type` = '{$tpt}' );" ) ) ) {
@@ -1076 +1102 @@
 
         // Now we give all the forums with topics the ID their last topic.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `forum`.`ID`, '_bbp_last_topic_id', `topic`.`ID`
-                        FROM `$wpdb->posts` AS `forum` INNER JOIN `$wpdb->posts` AS `topic` ON `forum`.`ID` = `topic`.`post_parent`
+                        FROM `{$bbp_db->posts}` AS `forum` INNER JOIN `{$bbp_db->posts}` AS `topic` ON `forum`.`ID` = `topic`.`post_parent`
                         WHERE `topic`.`post_status` = '{$pps}' AND `forum`.`post_type` = '{$fpt}' AND `topic`.`post_type` = '{$tpt}'
                         GROUP BY `forum`.`ID` );" ) ) ) {
@@ -1085 +1111 @@
 
         // For any remaining forums, give a topic ID of 0.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `ID`, '_bbp_last_topic_id', 0
-                        FROM `$wpdb->posts` AS `forum` LEFT JOIN `$wpdb->postmeta` AS `topic`
+                        FROM `{$bbp_db->posts}` AS `forum` LEFT JOIN `{$bbp_db->postmeta}` AS `topic`
                         ON `forum`.`ID` = `topic`.`post_id` AND `topic`.`meta_key` = '_bbp_last_topic_id'
                         WHERE `topic`.`meta_id` IS NULL AND `forum`.`post_type` = '{$fpt}' );" ) ) ) {
@@ -1094 +1120 @@
 
         // After that, we give all the topics with replies the ID their last reply (again, this time for a different reason).
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `topic`.`ID`, '_bbp_last_active_id', MAX( `reply`.`ID` )
-                        FROM `$wpdb->posts` AS `topic` INNER JOIN `$wpdb->posts` AS `reply` ON `topic`.`ID` = `reply`.`post_parent`
+                        FROM `{$bbp_db->posts}` AS `topic` INNER JOIN `{$bbp_db->posts}` AS `reply` ON `topic`.`ID` = `reply`.`post_parent`
                         WHERE `reply`.`post_status` = '{$pps}' AND `topic`.`post_type` = '{$tpt}' AND `reply`.`post_type` = '{$rpt}'
                         GROUP BY `topic`.`ID` );" ) ) ) {
@@ -1103 +1129 @@
 
         // For any remaining topics, give a reply ID of themself.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `ID`, '_bbp_last_active_id', `ID`
-                        FROM `$wpdb->posts` AS `topic` LEFT JOIN `$wpdb->postmeta` AS `reply`
+                        FROM `{$bbp_db->posts}` AS `topic` LEFT JOIN `{$bbp_db->postmeta}` AS `reply`
                         ON `topic`.`ID` = `reply`.`post_id` AND `reply`.`meta_key` = '_bbp_last_active_id'
                         WHERE `reply`.`meta_id` IS NULL AND `topic`.`post_type` = '{$tpt}' );" ) ) ) {
@@ -1112 +1138 @@
 
         // Give topics with replies their last update time.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `topic`.`ID`, '_bbp_last_active_time', MAX( `reply`.`post_date` )
-                        FROM `$wpdb->posts` AS `topic` INNER JOIN `$wpdb->posts` AS `reply` ON `topic`.`ID` = `reply`.`post_parent`
+                        FROM `{$bbp_db->posts}` AS `topic` INNER JOIN `{$bbp_db->posts}` AS `reply` ON `topic`.`ID` = `reply`.`post_parent`
                         WHERE `reply`.`post_status` = '{$pps}' AND `topic`.`post_type` = '{$tpt}' AND `reply`.`post_type` = '{$rpt}'
                         GROUP BY `topic`.`ID` );" ) ) ) {
@@ -1121 +1147 @@
 
         // Give topics without replies their last update time.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `ID`, '_bbp_last_active_time', `post_date`
-                        FROM `$wpdb->posts` AS `topic` LEFT JOIN `$wpdb->postmeta` AS `reply`
+                        FROM `{$bbp_db->posts}` AS `topic` LEFT JOIN `{$bbp_db->postmeta}` AS `reply`
                         ON `topic`.`ID` = `reply`.`post_id` AND `reply`.`meta_key` = '_bbp_last_active_time'
                         WHERE `reply`.`meta_id` IS NULL AND `topic`.`post_type` = '{$tpt}' );" ) ) ) {
@@ -1130 +1156 @@
 
         // Forums need to know what their last active item is as well. Now it gets a bit more complex to do in the database.
-        $forums = $wpdb->get_col( "SELECT `ID` FROM `$wpdb->posts` WHERE `post_type` = '{$fpt}' and `post_status` != 'auto-draft';" );
+        $forums = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '{$fpt}' and `post_status` != 'auto-draft';" );
         if ( is_wp_error( $forums ) ) {
                 return array( 10, sprintf( $statement, $result ) );
@@ -1168 +1194 @@
  */
 function bbp_admin_repair_sticky() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Repairing the sticky topic to the parent forum relationships&hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
-        $forums    = $wpdb->get_col( "SELECT ID FROM `{$wpdb->posts}` WHERE `post_type` = '" . bbp_get_forum_post_type() . "';" );
+
+        $forums    = $bbp_db->get_col( "SELECT ID FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_forum_post_type() . "';" );
 
         // Bail if no forums found
@@ -1181 +1209 @@
         // Loop through forums and get their sticky topics
         foreach ( $forums as $forum ) {
-                $forum_stickies[$forum] = get_post_meta( $forum, '_bbp_sticky_topics', true );
+                $forum_stickies[ $forum ] = get_post_meta( $forum, '_bbp_sticky_topics', true );
         }
 
@@ -1201 +1229 @@
                         // match the topic's forum ID, unset the forum's sticky meta.
                         if ( ! bbp_is_topic_super_sticky( $topic_id ) && $forum_id !== bbp_get_topic_forum_id( $topic_id ) ) {
-                                unset( $forum_stickies[$forum_id][$id] );
+                                unset( $forum_stickies[ $forum_id ][ $id ] );
                         }
                 }
 
                 // Get sticky topic ID's, or use empty string
-                $stickers = empty( $forum_stickies[$forum_id] ) ? '' : array_values( $forum_stickies[$forum_id] );
+                $stickers = empty( $forum_stickies[$forum_id] ) ? '' : array_values( $forum_stickies[ $forum_id ] );
 
                 // Update the forum's sticky topics meta
@@ -1234 +1262 @@
  */
 function bbp_admin_repair_closed_topics() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db        = bbp_db();
         $statement     = __( 'Repairing closed topics&hellip; %s', 'bbpress' );
+        $result        = __( 'No closed topics to repair.', 'bbpress' );
         $changed       = 0;
-        $result        = __( 'No closed topics to repair.', 'bbpress' );
-        $closed_topics = $wpdb->get_col( "SELECT ID FROM `{$wpdb->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = 'closed';" );
+
+        $closed_topics = $bbp_db->get_col( "SELECT ID FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = 'closed';" );
 
         // Bail if no closed topics found
-        if ( empty( $closed_topics ) || is_wp_error( $closed_topics ) )
+        if ( empty( $closed_topics ) || is_wp_error( $closed_topics ) ) {
                 return array( 1, sprintf( $statement, $result ) );
+        }
 
         // Loop through each closed topic
@@ -1262 +1293 @@
 
         // Complete results
-        $result = sprintf( _n( 'Complete! %d closed topic repaired.', 'Complete! %d closed topics repaired.', $changed, 'bbpress' ),      $changed );
+        $result = sprintf( _n( 'Complete! %d closed topic repaired.', 'Complete! %d closed topics repaired.', $changed, 'bbpress' ), $changed );
+
         return array( 0, sprintf( $statement, $result ) );
 }
@@ -1299 +1331 @@
  */
 function bbp_admin_repair_forum_meta() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Recalculating the forum for each post &hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
 
         // First, delete everything.
-        if ( is_wp_error( $wpdb->query( "DELETE FROM `$wpdb->postmeta` WHERE `meta_key` = '_bbp_forum_id';" ) ) ) {
+        if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_forum_id';" ) ) ) {
                 return array( 1, sprintf( $statement, $result ) );
         }
@@ -1314 +1347 @@
 
         // Next, give all the topics their parent forum id.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `topic`.`ID`, '_bbp_forum_id', `topic`.`post_parent`
-                        FROM `$wpdb->posts`
+                        FROM `$bbp_db->posts`
                                 AS `topic`
                         WHERE `topic`.`post_type` = '{$tpt}'
@@ -1324 +1357 @@
 
         // Next, give all the replies their parent forum id.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `reply`.`ID`, '_bbp_forum_id', `topic`.`post_parent`
-                        FROM `$wpdb->posts`
+                        FROM `$bbp_db->posts`
                                 AS `reply`
-                        INNER JOIN `$wpdb->posts`
+                        INNER JOIN `$bbp_db->posts`
                                 AS `topic`
                                 ON `reply`.`post_parent` = `topic`.`ID`
@@ -1353 +1386 @@
  */
 function bbp_admin_repair_topic_meta() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Recalculating the topic for each post &hellip; %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
 
         // First, delete everything.
-        if ( is_wp_error( $wpdb->query( "DELETE FROM `$wpdb->postmeta` WHERE `meta_key` = '_bbp_topic_id';" ) ) ) {
+        if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_topic_id';" ) ) ) {
                 return array( 1, sprintf( $statement, $result ) );
         }
@@ -1368 +1402 @@
 
         // Next, give all the topics with replies the ID their last reply.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `topic`.`ID`, '_bbp_topic_id', `topic`.`ID`
-                        FROM `$wpdb->posts`
+                        FROM `$bbp_db->posts`
                                 AS `topic`
                         WHERE `topic`.`post_type` = '{$tpt}'
@@ -1378 +1412 @@
 
         // Next, give all the topics with replies the ID their last reply.
-        if ( is_wp_error( $wpdb->query( "INSERT INTO `$wpdb->postmeta` (`post_id`, `meta_key`, `meta_value`)
+        if ( is_wp_error( $bbp_db->query( "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`)
                         ( SELECT `reply`.`ID`, '_bbp_topic_id', `topic`.`ID`
-                        FROM `$wpdb->posts`
+                        FROM `$bbp_db->posts`
                                 AS `reply`
-                        INNER JOIN `$wpdb->posts`
+                        INNER JOIN `$bbp_db->posts`
                                 AS `topic`
                                 ON `reply`.`post_parent` = `topic`.`ID`
@@ -1407 +1441 @@
  */
 function bbp_admin_repair_reply_menu_order() {
-        global $wpdb;
-
+
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement = __( 'Recalculating reply menu order &hellip; %s', 'bbpress' );
         $result    = __( 'No reply positions to recalculate!',         'bbpress' );
 
         // Delete cases where `_bbp_reply_to` was accidentally set to itself
-        if ( is_wp_error( $wpdb->query( "DELETE FROM `{$wpdb->postmeta}` WHERE `meta_key` = '_bbp_reply_to' AND `post_id` = `meta_value`;" ) ) ) {
+        if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_reply_to' AND `post_id` = `meta_value`;" ) ) ) {
                 return array( 1, sprintf( $statement, $result ) );
         }
@@ -1421 +1456 @@
 
         // Get an array of reply id's to update the menu oder for each reply
-        $replies = $wpdb->get_results( "SELECT `a`.`ID` FROM `{$wpdb->posts}` AS `a`
+        $replies = $bbp_db->get_results( "SELECT `a`.`ID` FROM `{$bbp_db->posts}` AS `a`
                                                                                 INNER JOIN (
                                                                                         SELECT `menu_order`, `post_parent`
-                                                                                        FROM `{$wpdb->posts}`
+                                                                                        FROM `{$bbp_db->posts}`
                                                                                         GROUP BY `menu_order`, `post_parent`
                                                                                         HAVING COUNT( * ) >1
@@ -1546 +1581 @@
         check_admin_referer( 'bbpress-reset' );
 
-        global $wpdb;
-
         // Stores messages
         $messages = array();
@@ -1563 +1596 @@
         $rpt = bbp_get_reply_post_type();
 
+        // Define variables
+        $bbp_db    = bbp_db();
         $statement  = __( 'Deleting Posts&hellip; %s', 'bbpress' );
-        $sql_posts  = $wpdb->get_results( "SELECT `ID` FROM `{$wpdb->posts}` WHERE `post_type` IN ('{$fpt}', '{$tpt}', '{$rpt}')", OBJECT_K );
-        $sql_delete = "DELETE FROM `{$wpdb->posts}` WHERE `post_type` IN ('{$fpt}', '{$tpt}', '{$rpt}')";
-        $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
+
+        $sql_posts  = $bbp_db->get_results( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` IN ('{$fpt}', '{$tpt}', '{$rpt}')", OBJECT_K );
+        $sql_delete = "DELETE FROM `{$bbp_db->posts}` WHERE `post_type` IN ('{$fpt}', '{$tpt}', '{$rpt}')";
+        $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
         $messages[] = sprintf( $statement, $result );
 
@@ -1578 +1614 @@
                 $statement  = __( 'Deleting Post Meta&hellip; %s', 'bbpress' );
                 $sql_meta   = implode( "', '", $sql_meta );
-                $sql_delete = "DELETE FROM `{$wpdb->postmeta}` WHERE `post_id` IN ('{$sql_meta}');";
-                $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
+                $sql_delete = "DELETE FROM `{$bbp_db->postmeta}` WHERE `post_id` IN ('{$sql_meta}');";
+                $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
                 $messages[] = sprintf( $statement, $result );
         }
@@ -1586 +1622 @@
 
         $statement  = __( 'Deleting Topic Tags&hellip; %s', 'bbpress' );
-        $sql_delete = "DELETE a,b,c FROM `{$wpdb->terms}` AS a LEFT JOIN `{$wpdb->term_taxonomy}` AS c ON a.term_id = c.term_id LEFT JOIN `{$wpdb->term_relationships}` AS b ON b.term_taxonomy_id = c.term_taxonomy_id WHERE c.taxonomy = 'topic-tag';";
-        $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
+        $sql_delete = "DELETE a,b,c FROM `{$bbp_db->terms}` AS a LEFT JOIN `{$bbp_db->term_taxonomy}` AS c ON a.term_id = c.term_id LEFT JOIN `{$bbp_db->term_relationships}` AS b ON b.term_taxonomy_id = c.term_taxonomy_id WHERE c.taxonomy = 'topic-tag';";
+        $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
         $messages[] = sprintf( $statement, $result );
 
@@ -1594 +1630 @@
         // First, if we're deleting previously imported users, delete them now
         if ( !empty( $_POST['bbpress-delete-imported-users'] ) ) {
-                $sql_users  = $wpdb->get_results( "SELECT `user_id` FROM `{$wpdb->usermeta}` WHERE `meta_key` = '_bbp_user_id'", OBJECT_K );
+                $sql_users  = $bbp_db->get_results( "SELECT `user_id` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '_bbp_user_id'", OBJECT_K );
                 if ( !empty( $sql_users ) ) {
                         $sql_meta = array();
@@ -1602 +1638 @@
                         $statement  = __( 'Deleting User&hellip; %s', 'bbpress' );
                         $sql_meta   = implode( "', '", $sql_meta );
-                        $sql_delete = "DELETE FROM `{$wpdb->users}` WHERE `ID` IN ('{$sql_meta}');";
-                        $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
+                        $sql_delete = "DELETE FROM `{$bbp_db->users}` WHERE `ID` IN ('{$sql_meta}');";
+                        $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
                         $messages[] = sprintf( $statement, $result );
                         $statement  = __( 'Deleting User Meta&hellip; %s', 'bbpress' );
-                        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `user_id` IN ('{$sql_meta}');";
-                        $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
+                        $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `user_id` IN ('{$sql_meta}');";
+                        $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
                         $messages[] = sprintf( $statement, $result );
                 }
@@ -1614 +1650 @@
         // Next, if we still have users that were not imported delete that meta data
         $statement  = __( 'Deleting User Meta&hellip; %s', 'bbpress' );
-        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` LIKE '%%_bbp_%%';";
-        $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
+        $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` LIKE '%%_bbp_%%';";
+        $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
         $messages[] = sprintf( $statement, $result );
 
@@ -1621 +1657 @@
 
         $statement  = __( 'Deleting Conversion Table&hellip; %s', 'bbpress' );
-        $table_name = $wpdb->prefix . 'bbp_converter_translator';
-        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) === $table_name ) {
-                $wpdb->query( "DROP TABLE {$table_name}" );
+        $table_name = $bbp_db->prefix . 'bbp_converter_translator';
+        if ( $bbp_db->get_var( "SHOW TABLES LIKE '{$table_name}'" ) === $table_name ) {
+                $bbp_db->query( "DROP TABLE {$table_name}" );
                 $result = $success;
         } else {

trunk/src/includes/common/functions.php

@@ -672 +672 @@
         }
 
-        // Define global to use get_meta_sql() and get_var() methods
-        global $wpdb;
-
         // Parse arguments against default values
         $r = bbp_parse_args( $post_data, array(
@@ -685 +682 @@
         ), 'check_for_duplicate' );
 
+        // Get the DB
+        $bbp_db = bbp_db();
+
         // Check for anonymous post
         if ( empty( $r['post_author'] ) && ( !empty( $r['anonymous_data'] ) && !empty( $r['anonymous_data']['bbp_anonymous_email'] ) ) ) {
@@ -690 +690 @@
                         'key'   => '_bbp_anonymous_email',
                         'value' => $r['anonymous_data']['bbp_anonymous_email']
-                ) ), 'post', $wpdb->posts, 'ID' );
+                ) ), 'post', $bbp_db->posts, 'ID' );
 
                 $join    = $clauses['join'];
@@ -698 +698 @@
         }
 
-        // Unslash $r to pass through $wpdb->prepare()
+        // Unslash $r to pass through DB->prepare()
         //
         // @see: https://bbpress.trac.wordpress.org/ticket/2185/
@@ -705 +705 @@
 
         // Prepare duplicate check query
-        $query  = $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} {$join} WHERE post_type = %s AND post_status != %s AND post_author = %d AND post_content = %s {$where}", $r['post_type'], $r['post_status'], $r['post_author'], $r['post_content'] );
-        $query .= !empty( $r['post_parent'] ) ? $wpdb->prepare( " AND post_parent = %d", $r['post_parent'] ) : '';
+        $query  = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} {$join} WHERE post_type = %s AND post_status != %s AND post_author = %d AND post_content = %s {$where}", $r['post_type'], $r['post_status'], $r['post_author'], $r['post_content'] );
+        $query .= !empty( $r['post_parent'] ) ? $bbp_db->prepare( " AND post_parent = %d", $r['post_parent'] ) : '';
         $query .= " LIMIT 1";
         $dupe   = apply_filters( 'bbp_check_for_duplicate_query', $query, $r );
 
-        if ( $wpdb->get_var( $dupe ) ) {
+        if ( $bbp_db->get_var( $dupe ) ) {
                 do_action( 'bbp_check_for_duplicate_trigger', $post_data );
                 return false;
@@ -1451 +1451 @@
  *
  * @since bbPress (r2996)
- *
- * @global DB $wpdb
+ * @deprecated bbPress (r5814)
+ *
  * @global WP $wp
  * @param string $where
@@ -1459 +1459 @@
  */
 function bbp_query_post_parent__in( $where, $object = '' ) {
-        global $wpdb, $wp;
+        global $wp;
 
         // Noop if WP core supports this already
@@ -1476 +1476 @@
         }
 
+        // Get the DB
+        $bbp_db = bbp_db();
+
         // Including specific post_parent's
         if ( ! empty( $object->query_vars['post_parent__in'] ) ) {
                 $ids    = implode( ',', wp_parse_id_list( $object->query_vars['post_parent__in'] ) );
-                $where .= " AND {$wpdb->posts}.post_parent IN ($ids)";
+                $where .= " AND {$bbp_db->posts}.post_parent IN ($ids)";
 
         // Excluding specific post_parent's
         } elseif ( ! empty( $object->query_vars['post_parent__not_in'] ) ) {
                 $ids    = implode( ',', wp_parse_id_list( $object->query_vars['post_parent__not_in'] ) );
-                $where .= " AND {$wpdb->posts}.post_parent NOT IN ($ids)";
+                $where .= " AND {$bbp_db->posts}.post_parent NOT IN ($ids)";
         }
 
@@ -1506 +1509 @@
  */
 function bbp_get_public_child_last_id( $parent_id = 0, $post_type = 'post' ) {
-        global $wpdb;
 
         // Bail if nothing passed
@@ -1528 +1530 @@
                 // Join post statuses together
                 $post_status = "'" . implode( "', '", $post_status ) . "'";
-
-                $child_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s' ORDER BY ID DESC LIMIT 1;", $parent_id, $post_type ) );
+                $bbp_db      = bbp_db();
+                $query       = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s' ORDER BY ID DESC LIMIT 1;", $parent_id, $post_type );
+                $child_id    = (int) $bbp_db->get_var( $query );
 
                 wp_cache_set( $cache_id, $child_id, 'bbpress_posts' );
@@ -1557 +1560 @@
  */
 function bbp_get_public_child_count( $parent_id = 0, $post_type = 'post' ) {
-        global $wpdb;
 
         // Bail if nothing passed
@@ -1579 +1581 @@
                 // Join post statuses together
                 $post_status = "'" . implode( "', '", $post_status ) . "'";
-
-                $child_count = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s';", $parent_id, $post_type ) );
+                $bbp_db      = bbp_db();
+                $query       = $bbp_db->prepare( "SELECT COUNT(ID) FROM {$bbp_db->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s';", $parent_id, $post_type );
+                $child_count = (int) $bbp_db->get_var( $query );
 
                 wp_cache_set( $cache_id, $child_count, 'bbpress_posts' );
@@ -1610 +1613 @@
  */
 function bbp_get_public_child_ids( $parent_id = 0, $post_type = 'post' ) {
-        global $wpdb;
 
         // Bail if nothing passed
@@ -1632 +1634 @@
                 // Join post statuses together
                 $post_status = "'" . implode( "', '", $post_status ) . "'";
-
-                $child_ids = (array) $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s' ORDER BY ID DESC;", $parent_id, $post_type ) );
+                $bbp_db      = bbp_db();
+                $query       = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s' ORDER BY ID DESC;", $parent_id, $post_type );
+                $child_ids   = (array) $bbp_db->get_col( $query );
 
                 wp_cache_set( $cache_id, $child_ids, 'bbpress_posts' );
@@ -1670 +1673 @@
  */
 function bbp_get_all_child_ids( $parent_id = 0, $post_type = 'post' ) {
-        global $wpdb;
 
         // Bail if nothing passed
@@ -1712 +1714 @@
                 // Join post statuses together
                 $post_status = "'" . implode( "', '", $post_status ) . "'";
-
-                $child_ids = (array) $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s' ORDER BY ID DESC;", $parent_id, $post_type ) );
+                $bbp_db      = bbp_db();
+                $query       = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s' ORDER BY ID DESC;", $parent_id, $post_type );
+                $child_ids   = (array) $bbp_db->get_col( $query );
 
                 wp_cache_set( $cache_id, $child_ids, 'bbpress_posts' );

trunk/src/includes/common/template.php

@@ -2058 +2058 @@
          */
         function bbp_get_view_url( $view = false ) {
-                global $wp_rewrite;
 
                 $view = bbp_get_view_id( $view );
@@ -2066 +2065 @@
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
-                        $url = $wp_rewrite->root . bbp_get_view_slug() . '/' . $view;
-                        $url = home_url( user_trailingslashit( $url ) );
+                if ( bbp_use_pretty_urls() ) {
+                        $url = trailingslashit( bbp_get_root_url() . bbp_get_view_slug() ) . $view;
+                        $url = user_trailingslashit( $url );
+                        $url = home_url( $url );
 
                 // Unpretty permalinks
                 } else {
-                        $url = add_query_arg( array( bbp_get_view_rewrite_id() => $view ), home_url( '/' ) );
+                        $url = add_query_arg( array(
+                                bbp_get_view_rewrite_id() => $view
+                        ), home_url( '/' ) );
                 }
 

trunk/src/includes/core/capabilities.php

@@ -244 +244 @@
 
 /**
- * Get the $wp_roles global without needing to declare it everywhere
+ * Get the `$wp_roles` global without needing to declare it everywhere
  *
  * @since bbPress (r4293)
  *
- * @global WP_Roles $wp_roles
  * @return WP_Roles
  */
 function bbp_get_wp_roles() {
-        global $wp_roles;
-
-        // Load roles if not set
-        if ( ! isset( $wp_roles ) ) {
-                $wp_roles = new WP_Roles();
-        }
-
-        return $wp_roles;
+
+        // Try to get `$wp_roles`
+        $retval = bbp_get_global_object( 'wp_roles', 'WP_Roles' );
+
+        // Set roles if not loaded
+        if ( is_null( $retval ) ) {
+                $retval = $GLOBALS['wp_roles'] = new WP_Roles();
+        }
+
+        return $retval;
 }
 
@@ -273 +274 @@
 
         // Get WordPress's roles (returns $wp_roles global)
-        $wp_roles  = bbp_get_wp_roles();
+        $wp_roles = bbp_get_wp_roles();
 
         // Apply the WordPress 'editable_roles' filter to let plugins ride along.
@@ -302 +303 @@
 
         foreach ( bbp_get_dynamic_roles() as $role_id => $details ) {
-                $wp_roles->roles[$role_id]        = $details;
-                $wp_roles->role_objects[$role_id] = new WP_Role( $role_id, $details['capabilities'] );
-                $wp_roles->role_names[$role_id]   = $details['name'];
+                $wp_roles->roles[ $role_id ]        = $details;
+                $wp_roles->role_objects[ $role_id ] = new WP_Role( $role_id, $details['capabilities'] );
+                $wp_roles->role_names[ $role_id ]   = $details['name'];
         }
 
@@ -316 +317 @@
  *
  * @see _bbp_reinit_dynamic_roles()
- *
- * @global WPDB $wpdb Used to get the database prefix
  */
 function bbp_filter_user_roles_option() {
-        global $wpdb;
-
-        $role_key = $wpdb->prefix . 'user_roles';
+        $role_key = bbp_db()->prefix . 'user_roles';
 
         add_filter( 'option_' . $role_key, '_bbp_reinit_dynamic_roles' );
@@ -419 +416 @@
 function bbp_get_dynamic_role_name( $role_id = '' ) {
         $roles = bbp_get_dynamic_roles();
-        $role  = isset( $roles[$role_id] ) ? $roles[$role_id]['name'] : '';
+        $role  = isset( $roles[ $role_id ] ) ? $roles[ $role_id ]['name'] : '';
 
         return apply_filters( 'bbp_get_dynamic_role_name', $role, $role_id, $roles );
@@ -445 +442 @@
                         // If keys match, unset
                         if ( $wp_role === $bbp_role ) {
-                                unset( $all_roles[$wp_role] );
+                                unset( $all_roles[ $wp_role ] );
                         }
                 }

trunk/src/includes/core/theme-compat.php

@@ -804 +804 @@
  *
  * @since bbPress (r2628)
+ *
  * @param string $redirect_url Redirect url
- * @uses WP_Rewrite::using_permalinks() To check if the blog is using permalinks
+ * @uses bbp_use_pretty_urls() To check if the blog is using permalinks
  * @uses bbp_get_paged() To get the current page number
  * @uses bbp_is_single_topic() To check if it's a topic page
  * @uses bbp_is_single_forum() To check if it's a forum page
+ *
  * @return bool|string False if it's a topic/forum and their first page,
  *                      otherwise the redirect url
  */
 function bbp_redirect_canonical( $redirect_url ) {
-        global $wp_rewrite;
 
         // Canonical is for the beautiful
-        if ( $wp_rewrite->using_permalinks() ) {
+        if ( bbp_use_pretty_urls() ) {
 
                 // If viewing beyond page 1 of several

trunk/src/includes/forums/functions.php

@@ -822 +822 @@
         // Only run queries if visibility is changing
         if ( bbp_get_public_status_id() !== $current_visibility ) {
-
-                // Update forums visibility setting
-                global $wpdb;
-                $wpdb->update( $wpdb->posts, array( 'post_status' => bbp_get_public_status_id() ), array( 'ID' => $forum_id ) );
+                $bbp_db = bbp_db();
+                $bbp_db->update( $bbp_db->posts, array( 'post_status' => bbp_get_public_status_id() ), array( 'ID' => $forum_id ) );
                 wp_transition_post_status( bbp_get_public_status_id(), $current_visibility, get_post( $forum_id ) );
                 bbp_clean_post_cache( $forum_id );
@@ -874 +872 @@
 
                 // Update forums visibility setting
-                global $wpdb;
-                $wpdb->update( $wpdb->posts, array( 'post_status' => bbp_get_private_status_id() ), array( 'ID' => $forum_id ) );
+                $bbp_db = bbp_db();
+                $bbp_db->update( $bbp_db->posts, array( 'post_status' => bbp_get_private_status_id() ), array( 'ID' => $forum_id ) );
                 wp_transition_post_status( bbp_get_private_status_id(), $current_visibility, get_post( $forum_id ) );
                 bbp_clean_post_cache( $forum_id );
@@ -924 +922 @@
 
                 // Update forums visibility setting
-                global $wpdb;
-                $wpdb->update( $wpdb->posts, array( 'post_status' => bbp_get_hidden_status_id() ), array( 'ID' => $forum_id ) );
+                $bbp_db = bbp_db();
+                $bbp_db->update( $bbp_db->posts, array( 'post_status' => bbp_get_hidden_status_id() ), array( 'ID' => $forum_id ) );
                 wp_transition_post_status( bbp_get_hidden_status_id(), $current_visibility, get_post( $forum_id ) );
                 bbp_clean_post_cache( $forum_id );
@@ -1511 +1509 @@
  */
 function bbp_update_forum_topic_count_hidden( $forum_id = 0, $topic_count = 0 ) {
-        global $wpdb;
 
         // If topic_id was passed as $forum_id, then get its forum
@@ -1528 +1525 @@
                 // Get topics of forum
                 if ( empty( $topic_count ) ) {
+                        $bbp_db      = bbp_db();
                         $post_status = "'" . implode( "','", array( bbp_get_trash_status_id(), bbp_get_spam_status_id(), bbp_get_pending_status_id() ) ) . "'";
-                        $topic_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s';", $forum_id, bbp_get_topic_post_type() ) );
+                        $topic_count = $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(ID) FROM {$bbp_db->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s';", $forum_id, bbp_get_topic_post_type() ) );
                 }
 
@@ -1563 +1561 @@
  */
 function bbp_update_forum_reply_count( $forum_id = 0 ) {
-        global $wpdb;
 
         $forum_id = bbp_get_forum_id( $forum_id );
@@ -1580 +1577 @@
         $topic_ids   = bbp_forum_query_topic_ids( $forum_id );
         if ( ! empty( $topic_ids ) ) {
+                $bbp_db      = bbp_db();
                 $topic_ids   = implode( ',', wp_parse_id_list( $topic_ids ) );
-                $reply_count = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_parent IN ( {$topic_ids} ) AND post_status = '%s' AND post_type = '%s';", bbp_get_public_status_id(), bbp_get_reply_post_type() ) );
+                $reply_count = (int) $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(ID) FROM {$bbp_db->posts} WHERE post_parent IN ( {$topic_ids} ) AND post_status = '%s' AND post_type = '%s';", bbp_get_public_status_id(), bbp_get_reply_post_type() ) );
         }
 
@@ -2004 +2002 @@
  */
 function bbp_forum_query_last_reply_id( $forum_id, $topic_ids = 0 ) {
-        global $wpdb;
 
         $cache_id = 'bbp_get_forum_' . $forum_id . '_reply_id';
@@ -2016 +2013 @@
 
                 if ( !empty( $topic_ids ) ) {
+                        $bbp_db    = bbp_db();
                         $topic_ids = implode( ',', wp_parse_id_list( $topic_ids ) );
-                        $reply_id  = (int) $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_parent IN ( {$topic_ids} ) AND post_status = '%s' AND post_type = '%s' ORDER BY ID DESC LIMIT 1;", bbp_get_public_status_id(), bbp_get_reply_post_type() ) );
+                        $reply_id  = (int) $bbp_db->get_var( $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_parent IN ( {$topic_ids} ) AND post_status = '%s' AND post_type = '%s' ORDER BY ID DESC LIMIT 1;", bbp_get_public_status_id(), bbp_get_reply_post_type() ) );
                 } else {
                         $reply_id = 0;

trunk/src/includes/replies/functions.php

@@ -1249 +1249 @@
  *                    and destination topic ids
  * @uses bbp_get_reply_post_type() To get the reply post type
- * @uses wpdb::prepare() To prepare our sql query
- * @uses wpdb::get_results() To execute the sql query and get results
  * @uses wp_update_post() To update the replies
  * @uses bbp_update_reply_topic_id() To update the reply topic id
@@ -2112 +2110 @@
         /** Proceed ***************************************************************/
 
-        global $wpdb;
-
         // Table name for posts
-        $table_name = $wpdb->prefix . 'posts';
+        $table_name = bbp_db()->prefix . 'posts';
 
         // Get the topic ID from the post_parent, set in bbp_has_replies()

trunk/src/includes/replies/template.php

@@ -109 +109 @@
  *                           others' replies
  * @uses WP_Query To make query and get the replies
- * @uses WP_Rewrite::using_permalinks() To check if the blog is using permalinks
+ * @uses bbp_use_pretty_urls() To check if the site is using pretty URLs
  * @uses get_permalink() To get the permalink
  * @uses add_query_arg() To add custom args to the url
@@ -120 +120 @@
  */
 function bbp_has_replies( $args = array() ) {
-        global $wp_rewrite;
 
         /** Defaults **************************************************************/
@@ -226 +225 @@
 
                 // If pretty permalinks are enabled, make our pagination pretty
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
 
                         // User's replies
@@ -245 +244 @@
                         }
 
-                        $base = trailingslashit( $base ) . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
+                        $base = trailingslashit( $base ) . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' );
 
                 // Unpretty permalinks
@@ -272 +271 @@
 
                         // Remove first page from pagination
-                        if ( $wp_rewrite->using_permalinks() ) {
-                                $bbp->reply_query->pagination_links = str_replace( $wp_rewrite->pagination_base . '/1/', '', $bbp->reply_query->pagination_links );
+                        if ( bbp_use_pretty_urls() ) {
+                                $bbp->reply_query->pagination_links = str_replace( bbp_get_paged_slug() . '/1/', '', $bbp->reply_query->pagination_links );
                         } else {
                                 $bbp->reply_query->pagination_links = str_replace( '&paged=1', '', $bbp->reply_query->pagination_links );
@@ -474 +473 @@
          * @uses bbp_get_reply_position() To get the reply position
          * @uses get_option() To get the replies per page option
-         * @uses WP_Rewrite::using_permalinks() To check if the blog uses
-         *                                       permalinks
+         * @uses bbp_use_pretty_urls() To check if the site uses pretty URLs
          * @uses add_query_arg() To add custom args to the url
          * @uses apply_filters() Calls 'bbp_get_reply_url' with the reply url,
@@ -506 +504 @@
                 // Include pagination
                 } else {
-                        global $wp_rewrite;
 
                         // Pretty permalinks
-                        if ( $wp_rewrite->using_permalinks() ) {
-                                $url = trailingslashit( $topic_url ) . trailingslashit( $wp_rewrite->pagination_base ) . trailingslashit( $reply_page ) . $reply_hash;
+                        if ( bbp_use_pretty_urls() ) {
+                                $url = trailingslashit( $topic_url ) . trailingslashit( bbp_get_paged_slug() ) . trailingslashit( $reply_page ) . $reply_hash;
 
                         // Yucky links
@@ -2022 +2019 @@
          */
         function bbp_get_reply_edit_url( $reply_id = 0 ) {
-                global $wp_rewrite;
 
                 $reply = bbp_get_reply( $reply_id );
@@ -2032 +2028 @@
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
                         $url = trailingslashit( $reply_link ) . bbp_get_edit_rewrite_id();
-                        $url = trailingslashit( $url );
+                        $url = user_trailingslashit( $url );
 
                 // Unpretty permalinks
                 } else {
-                        $url = add_query_arg( array( bbp_get_reply_post_type() => $reply->post_name, bbp_get_edit_rewrite_id() => '1' ), $reply_link );
+                        $url = add_query_arg( array(
+                                bbp_get_reply_post_type() => $reply->post_name,
+                                bbp_get_edit_rewrite_id() => '1'
+                        ), $reply_link );
                 }
 

trunk/src/includes/search/functions.php

@@ -16 +16 @@
  * Run the search query
  *
- * @since bbPress (r4579) 
+ * @since bbPress (r4579)
  *
  * @param mixed $new_args New arguments
@@ -26 +26 @@
 function bbp_search_query( $new_args = array() ) {
 
-        // Existing arguments 
+        // Existing arguments
         $query_args = bbp_get_search_query_args();
 
@@ -59 +59 @@
  *
  * @since bbPress (r4928)
+ *
  * @return If a redirect is not needed
  */
 function bbp_search_results_redirect() {
-        global $wp_rewrite;
-        
+
         // Bail if not a search request action
         if ( empty( $_GET['action'] ) || ( 'bbp-search-request' !== $_GET['action'] ) ) {
@@ -70 +70 @@
 
         // Bail if not using pretty permalinks
-        if ( ! $wp_rewrite->using_permalinks() ) {
+        if ( ! bbp_use_pretty_urls() ) {
                 return;
         }

trunk/src/includes/search/template.php

@@ -31 +31 @@
  * @uses bbp_get_search_terms() To get the search terms
  * @uses WP_Query To make query and get the search results
- * @uses WP_Rewrite::using_permalinks() To check if the blog is using permalinks
+ * @uses bbp_use_pretty_urls() To check if the site is using pretty URLs
  * @uses bbp_get_search_url() To get the forum search url
  * @uses paginate_links() To paginate search results
@@ -40 +40 @@
  */
 function bbp_has_search_results( $args = array() ) {
-        global $wp_rewrite;
 
         /** Defaults **************************************************************/
@@ -115 +114 @@
 
                 // If pretty permalinks are enabled, make our pagination pretty
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
 
                         // Shortcode territory
@@ -127 +126 @@
 
                         // Add pagination base
-                        $base = $base . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
+                        $base = $base . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' );
 
                 // Unpretty permalinks
@@ -154 +153 @@
 
                 // Remove first page from pagination
-                if ( $wp_rewrite->using_permalinks() ) {
-                        $bbp->search_query->pagination_links = str_replace( $wp_rewrite->pagination_base . '/1/', '', $bbp->search_query->pagination_links );
+                if ( bbp_use_pretty_urls() ) {
+                        $bbp->search_query->pagination_links = str_replace( bbp_get_paged_slug() . '/1/', '', $bbp->search_query->pagination_links );
                 } else {
                         $bbp->search_query->pagination_links = str_replace( '&paged=1', '', $bbp->search_query->pagination_links );
@@ -264 +263 @@
          */
         function bbp_get_search_url() {
-                global $wp_rewrite;
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
-                        $url = $wp_rewrite->root . bbp_get_search_slug();
-                        $url = home_url( user_trailingslashit( $url ) );
+                if ( bbp_use_pretty_urls() ) {
+                        $url = bbp_get_root_url() . bbp_get_search_slug();
+                        $url = user_trailingslashit( $url );
+                        $url = home_url( $url );
 
                 // Unpretty permalinks
                 } else {
-                        $url = add_query_arg( array( bbp_get_search_rewrite_id() => '' ), home_url( '/' ) );
+                        $url = add_query_arg( array(
+                                bbp_get_search_rewrite_id() => ''
+                        ), home_url( '/' ) );
                 }
 
@@ -302 +303 @@
          */
         function bbp_get_search_results_url() {
-                global $wp_rewrite;
 
                 // Get the search terms
@@ -308 +308 @@
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
 
                         // Root search URL
-                        $url = $wp_rewrite->root . bbp_get_search_slug();
+                        $url = bbp_get_root_url() . bbp_get_search_slug();
 
                         // Append search terms
                         if ( ! empty( $search_terms ) ) {
-                                $url = trailingslashit( $url ) . user_trailingslashit( urlencode( $search_terms ) );
+                                $url = trailingslashit( $url ) . urlencode( $search_terms );
                         }
 
                         // Run through home_url()
-                        $url = home_url( user_trailingslashit( $url ) );
+                        $url = user_trailingslashit( $url );
+                        $url = home_url( $url );
 
                 // Unpretty permalinks
                 } else {
-                        $url = add_query_arg( array( bbp_get_search_rewrite_id() => urlencode( $search_terms ) ), home_url( '/' ) );
+                        $url = add_query_arg( array(
+                                bbp_get_search_rewrite_id() => urlencode( $search_terms )
+                        ), home_url( '/' ) );
                 }
 

trunk/src/includes/topics/functions.php

@@ -1472 +1472 @@
         }
 
-        global $wpdb;
-
         // Prevent debug notices
         $from_reply_id = $destination_topic_id = 0;
@@ -1678 +1676 @@
         // get_posts() is not used because it doesn't allow us to use '>='
         // comparision without a filter.
-        $replies = (array) $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$wpdb->posts} WHERE {$wpdb->posts}.post_date >= %s AND {$wpdb->posts}.post_parent = %d AND {$wpdb->posts}.post_type = %s ORDER BY {$wpdb->posts}.post_date ASC", $from_reply->post_date, $source_topic->ID, bbp_get_reply_post_type() ) );
+        $bbp_db  = bbp_db();
+        $query   = $bbp_db->prepare( "SELECT * FROM {$bbp_db->posts} WHERE {$bbp_db->posts}.post_date >= %s AND {$bbp_db->posts}.post_parent = %d AND {$bbp_db->posts}.post_type = %s ORDER BY {$bbp_db->posts}.post_date ASC", $from_reply->post_date, $source_topic->ID, bbp_get_reply_post_type() );
+        $replies = (array) $bbp_db->get_results( $query );
 
         // Make sure there are replies to loop through
@@ -2509 +2509 @@
  */
 function bbp_update_topic_reply_count_hidden( $topic_id = 0, $reply_count = 0 ) {
-        global $wpdb;
 
         // If it's a reply, then get the parent (topic id)
@@ -2520 +2519 @@
         // Get replies of topic
         if ( empty( $reply_count ) ) {
+                $bbp_db      = bbp_db();
                 $post_status = "'" . implode( "','", array( bbp_get_trash_status_id(), bbp_get_spam_status_id(), bbp_get_pending_status_id() ) ) . "'";
-                $reply_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s';", $topic_id, bbp_get_reply_post_type() ) );
+                $query       = $bbp_db->prepare( "SELECT COUNT(ID) FROM {$bbp_db->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s';", $topic_id, bbp_get_reply_post_type() );
+                $reply_count = $bbp_db->get_var( $query );
         }
 
@@ -2673 +2674 @@
  * @uses bbp_get_topic_post_type() To get the topic post type
  * @uses wpdb::prepare() To prepare our sql query
- * @uses wpdb::get_col() To execute our query and get the column back
+ * @uses wpdb::get_var() To execute our query and get the column back
  * @uses update_post_meta() To update the topic voice count meta
  * @uses apply_filters() Calls 'bbp_update_topic_voice_count' with the voice
@@ -2680 +2681 @@
  */
 function bbp_update_topic_voice_count( $topic_id = 0 ) {
-        global $wpdb;
 
         // If it's a reply, then get the parent (topic id)
@@ -2692 +2692 @@
 
         // Query the DB to get voices in this topic
-        $voices = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( DISTINCT post_author ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' ) OR ( ID = %d AND post_type = '%s' );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
+        $bbp_db = bbp_db();
+        $query  = $bbp_db->prepare( "SELECT COUNT( DISTINCT post_author ) FROM {$bbp_db->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' ) OR ( ID = %d AND post_type = '%s' );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() );
+        $voices = (int) $bbp_db->get_var( $query );
 
         // Update the voice count for this topic id
@@ -2713 +2715 @@
  * @uses bbp_get_topic_post_type() To get the topic post type
  * @uses wpdb::prepare() To prepare our sql query
- * @uses wpdb::get_col() To execute our query and get the column back
+ * @uses wpdb::get_var() To execute our query and get the column back
  * @uses update_post_meta() To update the topic anonymous reply count meta
  * @uses apply_filters() Calls 'bbp_update_topic_anonymous_reply_count' with the
@@ -2720 +2722 @@
  */
 function bbp_update_topic_anonymous_reply_count( $topic_id = 0 ) {
-        global $wpdb;
 
         // If it's a reply, then get the parent (topic id)
@@ -2731 +2732 @@
         }
 
-        $anonymous_replies = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( ID ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' AND post_author = 0 ) OR ( ID = %d AND post_type = '%s' AND post_author = 0 );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
-
-        update_post_meta( $topic_id, '_bbp_anonymous_reply_count', $anonymous_replies );
-
-        return (int) apply_filters( 'bbp_update_topic_anonymous_reply_count', $anonymous_replies, $topic_id );
+        // Query the DB to get anonymous replies in this topic
+        $bbp_db  = bbp_db();
+        $query   = $bbp_db->prepare( "SELECT COUNT( ID ) FROM {$bbp_db->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' AND post_author = 0 ) OR ( ID = %d AND post_type = '%s' AND post_author = 0 );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() );
+        $replies = (int) $bbp_db->get_var( $query );
+
+        update_post_meta( $topic_id, '_bbp_anonymous_reply_count', $replies );
+
+        return (int) apply_filters( 'bbp_update_topic_anonymous_reply_count', $replies, $topic_id );
 }
 

trunk/src/includes/topics/template.php

@@ -128 +128 @@
  * @uses bbp_get_super_stickies() To get the super stickies
  * @uses bbp_get_stickies() To get the forum stickies
- * @uses wpdb::get_results() To execute our query and get the results
- * @uses WP_Rewrite::using_permalinks() To check if the blog is using permalinks
+ * @uses bbp_use_pretty_urls() To check if the site is using pretty URLs
  * @uses get_permalink() To get the permalink
  * @uses add_query_arg() To add custom args to the url
@@ -140 +139 @@
  */
 function bbp_has_topics( $args = array() ) {
-        global $wp_rewrite;
 
         /** Defaults **************************************************************/
@@ -354 +352 @@
 
                 // If pretty permalinks are enabled, make our pagination pretty
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
 
                         // User's topics
@@ -398 +396 @@
 
                         // Use pagination base
-                        $base = trailingslashit( $base ) . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
+                        $base = trailingslashit( $base ) . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' );
 
                 // Unpretty pagination
@@ -420 +418 @@
 
                 // Remove first page from pagination
-                $bbp->topic_query->pagination_links = str_replace( $wp_rewrite->pagination_base . "/1/'", "'", $bbp->topic_query->pagination_links );
+                $bbp->topic_query->pagination_links = str_replace( bbp_get_paged_slug() . "/1/'", "'", $bbp->topic_query->pagination_links );
         }
 
@@ -851 +849 @@
          *  - after: After the links
          * @uses bbp_get_topic_id() To get the topic id
-         * @uses WP_Rewrite::using_permalinks() To check if the blog is using
-         *                                       permalinks
+         * @uses bbp_use_pretty_urls() To check if the site is using pretty URLs
          * @uses user_trailingslashit() To add a trailing slash
          * @uses trailingslashit() To add a trailing slash
@@ -866 +863 @@
          */
         function bbp_get_topic_pagination( $args = array() ) {
-                global $wp_rewrite;
 
                 // Bail if threading replies
@@ -881 +877 @@
 
                 // If pretty permalinks are enabled, make our pagination pretty
-                if ( $wp_rewrite->using_permalinks() ) {
-                        $base = trailingslashit( get_permalink( $r['topic_id'] ) ) . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
+                if ( bbp_use_pretty_urls() ) {
+                        $base = trailingslashit( get_permalink( $r['topic_id'] ) ) . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' );
                 } else {
                         $base = add_query_arg( 'paged', '%#%', get_permalink( $r['topic_id'] ) );
@@ -910 +906 @@
 
                         // Remove first page from pagination
-                        if ( $wp_rewrite->using_permalinks() ) {
-                                $pagination_links = str_replace( $wp_rewrite->pagination_base . '/1/', '', $pagination_links );
+                        if ( bbp_use_pretty_urls() ) {
+                                $pagination_links = str_replace( bbp_get_paged_slug() . '/1/', '', $pagination_links );
                         } else {
                                 $pagination_links = str_replace( '&paged=1', '', $pagination_links );
@@ -2640 +2636 @@
          */
         function bbp_get_topic_edit_url( $topic_id = 0 ) {
-                global $wp_rewrite;
 
                 $topic = bbp_get_topic( $topic_id );
@@ -2651 +2646 @@
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
                         $url = trailingslashit( $topic_link ) . bbp_get_edit_rewrite_id();
-                        $url = trailingslashit( $url );
+                        $url = user_trailingslashit( $url );
 
                 // Unpretty permalinks
                 } else {
-                        $url = add_query_arg( array( bbp_get_topic_post_type() => $topic->post_name, bbp_get_edit_rewrite_id() => '1' ), $topic_link );
+                        $url = add_query_arg( array(
+                                bbp_get_topic_post_type() => $topic->post_name,
+                                bbp_get_edit_rewrite_id() => '1'
+                        ), $topic_link );
                 }
 
@@ -3767 +3765 @@
          */
         function bbp_get_topic_tag_edit_link( $tag = '' ) {
-                global $wp_rewrite;
 
                 // Get the term
@@ -3781 +3778 @@
 
                         // Pretty
-                        if ( $wp_rewrite->using_permalinks() ) {
+                        if ( bbp_use_pretty_urls() ) {
                                 $retval = user_trailingslashit( trailingslashit( bbp_get_topic_tag_link() ) . bbp_get_edit_rewrite_id() );
 

trunk/src/includes/users/capabilities.php

@@ -383 +383 @@
  * @since bbPress (r3405)
  *
- * @global WPDB $wpdb
  * @param int $user_id Optional. User ID to spam. Defaults to displayed user.
 
@@ -420 +419 @@
 
         // Arm the torpedos
-        global $wpdb;
+        $bbp_db = bbp_db();
 
         // Get the blog IDs of the user to mark as spam
@@ -427 +426 @@
         // If user has no blogs, they are a guest on this site
         if ( empty( $blogs ) ) {
-                $blogs[ $wpdb->blogid ] = array();
+                $blogs[ $bbp_db->blogid ] = array();
         }
 
@@ -441 +440 @@
 
                 // Get topics and replies
-                $posts = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_author = %d AND post_status = '%s' AND post_type IN ( {$post_types} )", $user_id, bbp_get_public_status_id() ) );
+                $query = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_author = %d AND post_status = '%s' AND post_type IN ( {$post_types} )", $user_id, bbp_get_public_status_id() );
+                $posts = $bbp_db->get_col( $query );
 
                 // Loop through posts and spam them
@@ -475 +475 @@
  * @since bbPress (r3405)
  *
- * @global WPDB $wpdb
  * @param int $user_id Optional. User ID to unspam. Defaults to displayed user.
  *
@@ -511 +510 @@
 
         // Arm the torpedos
-        global $wpdb;
+        $bbp_db = bbp_db();
 
         // Get the blog IDs of the user to mark as spam
@@ -518 +517 @@
         // If user has no blogs, they are a guest on this site
         if ( empty( $blogs ) ) {
-                $blogs[ $wpdb->blogid ] = array();
+                $blogs[ $bbp_db->blogid ] = array();
         }
 
@@ -532 +531 @@
 
                 // Get topics and replies
-                $posts = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_author = %d AND post_status = '%s' AND post_type IN ( {$post_types} )", $user_id, bbp_get_spam_status_id() ) );
+                $query = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_author = %d AND post_status = '%s' AND post_type IN ( {$post_types} )", $user_id, bbp_get_spam_status_id() );
+                $posts = $bbp_db->get_col( $query );
 
                 // Loop through posts and spam them

trunk/src/includes/users/functions.php

@@ -188 +188 @@
         }
 
-        global $wpdb;
-
-        $key   = $wpdb->prefix . '_bbp_favorites';
-        $users = wp_cache_get( 'bbp_get_topic_favoriters_' . $topic_id, 'bbpress_users' );
+        $bbp_db = bbp_db();
+        $key    = $bbp_db->prefix . '_bbp_favorites';
+        $users  = wp_cache_get( 'bbp_get_topic_favoriters_' . $topic_id, 'bbpress_users' );
         if ( false === $users ) {
-                $users = $wpdb->get_col( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = '{$key}' and FIND_IN_SET('{$topic_id}', meta_value) > 0" );
+                $users = $bbp_db->get_col( "SELECT user_id FROM {$bbp_db->usermeta} WHERE meta_key = '{$key}' and FIND_IN_SET('{$topic_id}', meta_value) > 0" );
                 wp_cache_set( 'bbp_get_topic_favoriters_' . $topic_id, $users, 'bbpress_users' );
         }
@@ -499 +498 @@
         }
 
-        global $wpdb;
-
-        $key   = $wpdb->prefix . '_bbp_forum_subscriptions';
-        $users = wp_cache_get( 'bbp_get_forum_subscribers_' . $forum_id, 'bbpress_users' );
+        $bbp_db = bbp_db();
+        $key    = $bbp_db->prefix . '_bbp_forum_subscriptions';
+        $users  = wp_cache_get( 'bbp_get_forum_subscribers_' . $forum_id, 'bbpress_users' );
         if ( false === $users ) {
-                $users = $wpdb->get_col( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = '{$key}' and FIND_IN_SET('{$forum_id}', meta_value) > 0" );
+                $users = $bbp_db->get_col( "SELECT user_id FROM {$bbp_db->usermeta} WHERE meta_key = '{$key}' and FIND_IN_SET('{$forum_id}', meta_value) > 0" );
                 wp_cache_set( 'bbp_get_forum_subscribers_' . $forum_id, $users, 'bbpress_users' );
         }
@@ -527 +525 @@
         }
 
-        global $wpdb;
-
-        $key   = $wpdb->prefix . '_bbp_subscriptions';
-        $users = wp_cache_get( 'bbp_get_topic_subscribers_' . $topic_id, 'bbpress_users' );
+        $bbp_db = bbp_db();
+        $key    = $bbp_db->prefix . '_bbp_subscriptions';
+        $users  = wp_cache_get( 'bbp_get_topic_subscribers_' . $topic_id, 'bbpress_users' );
         if ( false === $users ) {
-                $users = $wpdb->get_col( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = '{$key}' and FIND_IN_SET('{$topic_id}', meta_value) > 0" );
+                $users = $bbp_db->get_col( "SELECT user_id FROM {$bbp_db->usermeta} WHERE meta_key = '{$key}' and FIND_IN_SET('{$topic_id}', meta_value) > 0" );
                 wp_cache_set( 'bbp_get_topic_subscribers_' . $topic_id, $users, 'bbpress_users' );
         }
@@ -1316 +1313 @@
  *                           is the one of the logged in user)
  * @uses get_option() To get the displayed user's new email id option
- * @uses wpdb::prepare() To sanitize our sql query
- * @uses wpdb::get_var() To execute our query and get back the variable
- * @uses wpdb::query() To execute our query
  * @uses wp_update_user() To update the user
  * @uses delete_option() To delete the displayed user's email id option
@@ -1331 +1325 @@
  * @uses get_userdata() To get the user data
  * @uses is_email() To check if the string is an email id or not
- * @uses wpdb::get_blog_prefix() To get the blog prefix
  * @uses is_network_admin() To check if the user is the network admin
  * @uses revoke_super_admin() To revoke super admin priviledges
@@ -1449 +1442 @@
  * @since bbPress (r5660)
  *
- * @global object $wpdb
- * @param  string $action
+ * @param string $action
  *
  * @uses bbp_is_user_home_edit()         To check if on the current users profile edit page
@@ -1531 +1523 @@
                                         // Update signups table, if signups table & entry exists
                                         // For Multisite & BuddyPress compatibility
-                                        global $wpdb;
-                                        if ( ! empty( $wpdb->signups ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", bbp_get_displayed_user_field( 'user_login', 'raw' ) ) ) ) {
-                                                $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, bbp_get_displayed_user_field( 'user_login', 'raw' ) ) );
+                                        $bbp_db = bbp_db();
+                                        if ( ! empty( $bbp_db->signups ) && $bbp_db->get_var( $bbp_db->prepare( "SELECT user_login FROM {$bbp_db->signups} WHERE user_login = %s", bbp_get_displayed_user_field( 'user_login', 'raw' ) ) ) ) {
+                                                $bbp_db->query( $bbp_db->prepare( "UPDATE {$bbp_db->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, bbp_get_displayed_user_field( 'user_login', 'raw' ) ) );
                                         }
 
@@ -1727 +1719 @@
  *
  * @since bbPress (r3633)
+ *
  * @param int $user_id User ID to get count for
- * @global WPDB $wpdb
+ *
  * @uses bbp_get_user_id()
  * @uses get_posts_by_author_sql()
  * @uses bbp_get_topic_post_type()
  * @uses apply_filters()
+ *
  * @return int Raw DB count of topics
  */
@@ -1741 +1735 @@
         }
 
-        global $wpdb;
-
-        $where = get_posts_by_author_sql( bbp_get_topic_post_type(), true, $user_id );
-        $count = (int) $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->posts} {$where}" );
+        $bbp_db = bbp_db();
+        $where  = get_posts_by_author_sql( bbp_get_topic_post_type(), true, $user_id );
+        $count  = (int) $bbp_db->get_var( "SELECT COUNT(*) FROM {$bbp_db->posts} {$where}" );
 
         return (int) apply_filters( 'bbp_get_user_topic_count_raw', $count, $user_id );
@@ -1753 +1746 @@
  *
  * @since bbPress (r3633)
+ *
  * @param int $user_id User ID to get count for
- * @global WPDB $wpdb
+ *
  * @uses bbp_get_user_id()
  * @uses get_posts_by_author_sql()
  * @uses bbp_get_reply_post_type()
  * @uses apply_filters()
+ *
  * @return int Raw DB count of replies
  */
@@ -1767 +1762 @@
         }
 
-        global $wpdb;
-
-        $where = get_posts_by_author_sql( bbp_get_reply_post_type(), true, $user_id );
-        $count = (int) $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->posts} {$where}" );
+        $bbp_db = bbp_db();
+        $where  = get_posts_by_author_sql( bbp_get_reply_post_type(), true, $user_id );
+        $count  = (int) $bbp_db->get_var( "SELECT COUNT(*) FROM {$bbp_db->posts} {$where}" );
 
         return (int) apply_filters( 'bbp_get_user_reply_count_raw', $count, $user_id );
@@ -1846 +1840 @@
 
         // Add them up and filter them
-        $new_count = apply_filters( 'bbp_bump_user_reply_count', ( (int) $count + (int) $difference ), $user_id, $difference, $count );
+        $new_count = apply_filters( 'bbp_bump_user_reply_count', $user_reply_count, $user_id, $difference, $count );
 
         return bbp_update_user_reply_count( $user_id, $new_count );
@@ -2069 +2063 @@
  *
  * @since bbPress (r3813)
- * @global WPDB $wpdb
  */
 function bbp_user_maybe_convert_pass() {
@@ -2083 +2076 @@
         }
 
-        global $wpdb;
-
         // Bail if no user password to convert
-        $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->users} INNER JOIN {$wpdb->usermeta} ON user_id = ID WHERE meta_key = '_bbp_class' AND user_login = '%s' LIMIT 1", $username ) );
+        $bbp_db = bbp_db();
+        $query  = $bbp_db->prepare( "SELECT * FROM {$bbp_db->users} INNER JOIN {$bbp_db->usermeta} ON user_id = ID WHERE meta_key = '_bbp_class' AND user_login = '%s' LIMIT 1", $username );
+        $row    = $bbp_db->get_row( $query );
         if ( empty( $row ) || is_wp_error( $row ) ) {
                 return;

trunk/src/includes/users/template.php

@@ -336 +336 @@
          * @param string $user_nicename Optional. User nicename
          * @uses bbp_get_user_id() To get user id
-         * @uses WP_Rewrite::using_permalinks() To check if the blog is using
-         *                                       permalinks
+         * @uses bbp_use_pretty_urls() To check if the site is using pretty URLs
          * @uses add_query_arg() To add custom args to the url
          * @uses home_url() To get blog home url
@@ -345 +344 @@
          */
         function bbp_get_user_profile_url( $user_id = 0, $user_nicename = '' ) {
-                global $wp_rewrite;
 
                 // Use displayed user ID if there is one, and one isn't requested
@@ -360 +358 @@
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
 
                         // Get username if not passed
@@ -367 +365 @@
                         }
 
-                        $url = trailingslashit( $wp_rewrite->root . bbp_get_user_slug() ) . $user_nicename;
+                        $url = trailingslashit( bbp_get_root_url() . bbp_get_user_slug() ) . $user_nicename;
                         $url = user_trailingslashit( $url );
                         $url = home_url( $url );
@@ -439 +437 @@
          * @uses bbp_get_user_id() To get user id
          * @uses bbp_get_user_profile_url() To get the user profile url
-         * @uses WP_Rewrite::using_permalinks() To check if the blog is using
-         *                                       permalinks
+         * @uses bbp_use_pretty_urls() To check if the site is using pretty URLs
          * @uses add_query_arg() To add custom args to the url
          * @uses home_url() To get blog home url
@@ -448 +445 @@
          */
         function bbp_get_user_profile_edit_url( $user_id = 0, $user_nicename = '' ) {
-                global $wp_rewrite;
 
                 $user_id = bbp_get_user_id( $user_id );
@@ -465 +461 @@
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
                         $url = trailingslashit( $profile_url ) . 'edit';
                         $url = user_trailingslashit( $url );
@@ -820 +816 @@
          */
         function bbp_get_favorites_permalink( $user_id = 0 ) {
-                global $wp_rewrite;
 
                 // Use displayed user ID if there is one, and one isn't requested
@@ -838 +833 @@
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
                         $url = trailingslashit( $profile_url ) . bbp_get_user_favorites_rewrite_id();
                         $url = user_trailingslashit( $url );
@@ -980 +975 @@
          */
         function bbp_get_subscriptions_permalink( $user_id = 0 ) {
-                global $wp_rewrite;
 
                 // Use displayed user ID if there is one, and one isn't requested
@@ -998 +992 @@
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
                         $url = trailingslashit( $profile_url ) . bbp_get_user_subscriptions_slug();
                         $url = user_trailingslashit( $url );
@@ -1421 +1415 @@
          */
         function bbp_get_user_topics_created_url( $user_id = 0 ) {
-                global $wp_rewrite;
 
                 // Use displayed user ID if there is one, and one isn't requested
@@ -1439 +1432 @@
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
                         $url = trailingslashit( $profile_url ) . bbp_get_topic_archive_slug();
                         $url = user_trailingslashit( $url );
@@ -1479 +1472 @@
          */
         function bbp_get_user_replies_created_url( $user_id = 0 ) {
-                global $wp_rewrite;
 
                 // Use displayed user ID if there is one, and one isn't requested
@@ -1497 +1489 @@
 
                 // Pretty permalinks
-                if ( $wp_rewrite->using_permalinks() ) {
+                if ( bbp_use_pretty_urls() ) {
                         $url = trailingslashit( $profile_url ) . bbp_get_reply_archive_slug();
                         $url = user_trailingslashit( $url );