Ticket #2153: 2153.1.diff

includes/common/template-tags.php

@@ -1303 +1303 @@
                         'selected'           => 0,
                         'sort_column'        => 'menu_order',
                         'post_parent'        => 0,
+                        'child_of'           => 0,
                         'exclude'            => array(),
                         'numberposts'        => -1,
                         'orderby'            => 'menu_order',
@@ -1366 +1367 @@
                 $tab       = (int) $r['tab'];
                 $retval    = '';
                 $disabled  = disabled( isset( bbpress()->options[$r['disabled']] ), true, false );
-                $posts     = get_pages( array(
+
+                $args      = array(
                         'post_type'          => $r['post_type'],
                         'post_status'        => $r['post_status'],
                         'sort_column'        => $r['sort_column'],
-                        'post_parent'        => $r['post_parent'],
+                        'post_parent'        => $r['post_parent'], // Cheating, get_pages() uses 'parent', not 'post_parent'
+                        'child_of'           => $r['child_of'],    // Cheating, get_posts() doesn't have 'child_of'
                         'exclude'            => $r['exclude'],
                         'numberposts'        => $r['numberposts'],
                         'orderby'            => $r['orderby'],
                         'order'              => $r['order'],
                         'walker'             => $r['walker'],
                         'disable_categories' => $r['disable_categories']
-                ) );
+                );
 
+                // Use get_posts for non-hierarchical topics
+                if ( $args['post_type'] == bbp_get_topic_post_type() )
+                        $posts = get_posts( $args );
+
+                // Use get_pages for forums
+                else
+                        $posts = get_pages( $args );
+
                 /** Drop Down *********************************************************/
 
                 // Items found