Changeset 5388

Timestamp:

06/12/2014 02:11:03 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Tweak bbp_get_dropdown() to allow an array of custom posts to be used. See #2617.

File:

• trunk/src/includes/common/template.php (modified) (7 diffs)

trunk/src/includes/common/template.php

@@ -1281 +1281 @@
 
     /**
-     * Output the current tab index of a given form
+     * Return the current tab index of a given form
      *
      * Use this function to handle the tab indexing of user facing forms
@@ -1317 +1317 @@
 }
     /**
-     * Output a select box allowing to pick which forum/topic a new
+     * Return a select box allowing to pick which forum/topic a new
      * topic/reply belongs in.
      *
@@ -1359 +1359 @@
     function bbp_get_dropdown( $args = '' ) {
 
+        // Setup return value
+        $retval = '';
+
         /** Arguments *********************************************************/
 
@@ -1371 +1374 @@
             'orderby'            => 'menu_order title',
             'order'              => 'ASC',
+            'posts'              => array(),
             'walker'             => '',
 
@@ -1397 +1401 @@
         }
 
-        /** Setup variables ***************************************************/
-
-        $retval = '';
-        $posts  = get_posts( array(
-            'post_type'          => $r['post_type'],
-            'post_status'        => $r['post_status'],
-            'exclude'            => $r['exclude'],
-            'post_parent'        => $r['post_parent'],
-            'numberposts'        => $r['numberposts'],
-            'orderby'            => $r['orderby'],
-            'order'              => $r['order'],
-            'walker'             => $r['walker'],
-            'disable_categories' => $r['disable_categories']
-        ) );
+        /** Setup Posts *******************************************************/
+
+        /**
+         * Allow passing of custom posts data
+         *
+         * @see bbp_get_reply_to_dropdown() as an example
+         */
+        if ( empty( $r['posts'] ) ) {
+            $r['posts'] = get_posts( array(
+                'post_type'   => $r['post_type'],
+                'post_status' => $r['post_status'],
+                'post_parent' => $r['post_parent'],
+                'exclude'     => $r['exclude'],
+                'numberposts' => $r['numberposts'],
+                'orderby'     => $r['orderby'],
+                'order'       => $r['order'],
+            ) );            
+        }
 
         /** Drop Down *********************************************************/
@@ -1469 +1477 @@
 
         // Items found so walk the tree
-        if ( !empty( $posts ) ) {
-            $retval .= walk_page_dropdown_tree( $posts, 0, $r );
+        if ( !empty( $r['posts'] ) ) {
+            $retval .= walk_page_dropdown_tree( $r['posts'], 0, $r );
         }
 
@@ -1591 +1599 @@
 
         <input type="hidden" name="bbp_reply_id"    id="bbp_reply_id"    value="<?php bbp_reply_id(); ?>" />
-        <input type="hidden" name="bbp_reply_to"    id="bbp_reply_to"    value="<?php bbp_form_reply_to(); ?>" />
         <input type="hidden" name="action"          id="bbp_post_action" value="bbp-edit-reply" />