Changeset 4805 for trunk/includes/replies/functions.php

Timestamp:

03/15/2013 08:34:43 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Remove meta query check from _bbp_has_replies_where(), add some brackets to improve readability. Addresses regression introduced in r4795. See #2221

File:

• trunk/includes/replies/functions.php (modified) (1 diff)

trunk/includes/replies/functions.php

@@ -1729 +1729 @@
 function _bbp_has_replies_where( $where = '', $query = false ) {
 
+    /** Bail ******************************************************************/
+
     // Bail if the sky is falling
-    if ( empty( $where ) || empty( $query ) )
+    if ( empty( $where ) || empty( $query ) ) {
         return $where;
+    }
 
     // Bail if no post_parent to replace
-    if ( ! is_numeric( $query->get( 'post_parent' ) ) )
+    if ( ! is_numeric( $query->get( 'post_parent' ) ) ) {
         return $where;
+    }
 
     // Bail if not a topic and reply query
-    if ( array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ) != $query->get( 'post_type' ) )
+    if ( array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ) != $query->get( 'post_type' ) ) {
         return $where;
-
-    // Bail if meta query (cannot FORCE INDEX when join'ing postmeta)
-    if ( $query->get( 'meta_key' ) || $query->get( 'meta_query' ) )
+    }
+
+    // Bail if including or excluding specific post ID's
+    if ( $query->get( 'post__not_in' ) || $query->get( 'post__in' ) ) {
         return $where;
-
-    // Bail if including or excluding specific post ID's
-    if ( $query->get( 'post__not_in' ) || $query->get( 'post__in' ) )
-        return $where;
+    }
+
+    /** Proceed ***************************************************************/
 
     global $wpdb;