Changeset 5827 for trunk/src/includes/users/capabilities.php

Timestamp:

07/14/2015 12:31:42 AM (10 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.

File:

• trunk/src/includes/users/capabilities.php (modified) (8 diffs)

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