Changeset 5827 for trunk/src/includes/common/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/common/functions.php (modified) (16 diffs)

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' );