Changeset 4597 for trunk/includes/forums/template-tags.php

Timestamp:

12/20/2012 10:46:04 AM (13 years ago)

Author:

johnjamesjacoby

Message:

In bbp_list_forums(), remove check for subforums meta, and trust the subforums query to do the work.

In the subforums query, avoid using get_posts() and use a new WP_Query object instead. Also fix some return value type-casting.

Fixes #2085.

File:

• trunk/includes/forums/template-tags.php (modified) (2 diffs)

trunk/includes/forums/template-tags.php

@@ -643 +643 @@
     // Parse arguments against default values
     $r = bbp_parse_args( $args, array(
-        'post_parent'    => 0,
-        'post_type'      => bbp_get_forum_post_type(),
-        'post_status'    => implode( ',', $post_stati ),
-        'posts_per_page' => get_option( '_bbp_forums_per_page', 50 ),
-        'orderby'        => 'menu_order',
-        'order'          => 'ASC'
+        'post_parent'         => 0,
+        'post_type'           => bbp_get_forum_post_type(),
+        'post_status'         => implode( ',', $post_stati ),
+        'posts_per_page'      => get_option( '_bbp_forums_per_page', 50 ),
+        'orderby'             => 'menu_order',
+        'order'               => 'ASC',
+        'ignore_sticky_posts' => true,
+        'no_found_rows'       => true
     ), 'forum_get_subforums' );
     $r['post_parent'] = bbp_get_forum_id( $r['post_parent'] );
 
+    // Create a new query for the subforums
+    $get_posts = new WP_Query();
+
     // No forum passed
-    $sub_forums = !empty( $r['post_parent'] ) ? get_posts( $r ) : '';
-
-    return apply_filters( 'bbp_forum_get_sub_forums', (array) $sub_forums, $args );
+    $sub_forums = !empty( $r['post_parent'] ) ? $get_posts->query( $r ) : array();
+
+    return (array) apply_filters( 'bbp_forum_get_subforums', $sub_forums, $args );
 }
 
@@ -699 +704 @@
     ), 'list_forums' );
 
-    // Bail if there are no subforums
-    if ( !bbp_get_forum_subforum_count( $r['forum_id'], false ) )
-        return;
-
     // Loop through forums and create a list
     $sub_forums = bbp_forum_get_subforums( $r['forum_id'] );