Changeset 5827 for trunk/src/includes/admin/admin.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/admin/admin.php (modified) (7 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!