Changeset 5827 for trunk/src/includes/forums/functions.php

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.

File:

• trunk/src/includes/forums/functions.php (modified) (9 diffs)

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;