Changeset 5395

Timestamp:

06/12/2014 09:38:06 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Reduce unnecessary complexity and flexibility in bbp_get_reply_to_dropdown(). Since this is a purpose built form field, explicit filtering of arguments is not necessary. See #2617.

File:

• trunk/src/includes/replies/template.php (modified) (2 diffs)

trunk/src/includes/replies/template.php

@@ -2514 +2514 @@
         $topic_id = bbp_get_reply_topic_id( $reply_id );
 
-        // Setup default dropdown arguments
-        $r = bbp_parse_args( array(
-            'show_none'   => sprintf( esc_attr__( '%1$s - %2$s', 'bbpress' ), $topic_id, bbp_get_topic_title( $topic_id ) ),
-            'select_id'   => 'bbp_reply_to',
-            'exclude'     => array(),
-            'selected'    => $reply_to,
-            'post_parent' => $topic_id,
+        // Get the replies
+        $posts = get_posts( array(
             'post_type'   => bbp_get_reply_post_type(),
             'post_status' => bbp_get_public_status_id(),
-            'max_depth'   => bbp_thread_replies_depth(),
-            'page'        => 1,
-            'per_page'    => -1,
+            'post_parent' => $topic_id,
+            'numberposts' => -1,
             'orderby'     => 'menu_order',
             'order'       => 'ASC',
-            'walker'      => new BBP_Walker_Reply_Dropdown()
-        ), 'reply_to_drodown' );
-
-        // Get the replies
-        $posts = get_posts( array(
-            'post_type'   => $r['post_type'],
-            'post_status' => $r['post_status'],
-            'post_parent' => $r['post_parent'],
-            'exclude'     => $r['exclude'],
-            'numberposts' => $r['per_page'],
-            'orderby'     => $r['orderby'],
-            'order'       => $r['order'],
         ) );
 
@@ -2559 +2541 @@
         // Get the dropdown and return it
         $retval = bbp_get_dropdown( array(
-            'show_none'    => $r['show_none'],
-            'select_id'    => $r['select_id'],
-            'exclude'      => $r['exclude'],
-            'selected'     => $r['selected'],
-            'post_parent'  => $r['post_parent'],
-            'post_type'    => $r['post_type'],
-            'max_depth'    => $r['max_depth'],
-            'page'         => $r['page'],
-            'per_page'     => $r['per_page'],
-            'walker'       => $r['walker'],
+            'show_none'    => sprintf( esc_attr__( '%1$s - %2$s', 'bbpress' ), $topic_id, bbp_get_topic_title( $topic_id ) ),
+            'select_id'    => 'bbp_reply_to',
+            'exclude'      => $reply_id,
+            'selected'     => $reply_to,
+            'post_parent'  => $topic_id,
+            'post_type'    => bbp_get_reply_post_type(),
+            'max_depth'    => bbp_thread_replies_depth(),
+            'page'         => 1,
+            'per_page'     => -1,
+            'walker'       => new BBP_Walker_Reply_Dropdown(),
             'posts'        => $posts
         ) );
 
         // Filter and return
-        return apply_filters( 'bbp_get_reply_to_dropdown', $retval, $r, $reply_id, $reply_to, $topic_id );
+        return apply_filters( 'bbp_get_reply_to_dropdown', $retval, $reply_id, $reply_to, $topic_id );
     }