Changeset 4485

Timestamp:

11/23/2012 11:13:27 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Extract:

• Remove extract() from bbp_get_dropdown().
• Other general code cleanup.
• See #2056.

File:

• trunk/includes/common/template-tags.php (modified) (6 diffs)

trunk/includes/common/template-tags.php

@@ -1248 +1248 @@
                 /** Arguments *********************************************************/
 
-                $defaults = array (
+                $r = bbp_parse_args( $args, array(
                         'post_type'          => bbp_get_forum_post_type(),
                         'selected'           => 0,
@@ -1266 +1266 @@
                         'disable_categories' => true,
                         'disabled'           => ''
-                );
-                $r = bbp_parse_args( $args, $defaults, 'get_dropdown' );
+                ), 'get_dropdown' );
 
                 if ( empty( $r['walker'] ) ) {
@@ -1275 +1274 @@
 
                 // Force 0
-                if ( is_numeric( $r['selected'] ) && $r['selected'] < 0 )
+                if ( is_numeric( $r['selected'] ) && $r['selected'] < 0 ) {
                         $r['selected'] = 0;
-
-                extract( $r );
+                }
 
                 // Unset the args not needed for WP_Query to avoid any possible conflicts.
@@ -1293 +1291 @@
 
                 // Forums
-                if ( bbp_get_forum_post_type() == $post_type ) {
+                if ( bbp_get_forum_post_type() == $r['post_type'] ) {
 
                         // Private forums
@@ -1311 +1309 @@
                 /** Setup variables ***************************************************/
 
-                $name      = esc_attr( $select_id );
+                $name      = esc_attr( $r['select_id'] );
                 $select_id = $name;
-                $tab       = (int) $tab;
+                $tab       = (int) $r['tab'];
                 $retval    = '';
                 $posts     = get_posts( $r );
-                $disabled  = disabled( isset( bbpress()->options[$disabled] ), true, false );
+                $disabled  = disabled( isset( bbpress()->options[$r['disabled']] ), true, false );
 
                 /** Drop Down *********************************************************/
@@ -1322 +1320 @@
                 // Items found
                 if ( !empty( $posts ) ) {
-                        if ( empty( $options_only ) ) {
+                        if ( empty( $r['options_only'] ) ) {
                                 $tab     = !empty( $tab ) ? ' tabindex="' . $tab . '"' : '';
                                 $retval .= '<select name="' . $name . '" id="' . $select_id . '"' . $tab  . $disabled . '>' . "\n";
                         }
 
-                        $retval .= !empty( $show_none ) ? "\t<option value=\"\" class=\"level-0\">" . $show_none . '</option>' : '';
+                        $retval .= !empty( $r['show_none'] ) ? "\t<option value=\"\" class=\"level-0\">" . $r['show_none'] . '</option>' : '';
                         $retval .= walk_page_dropdown_tree( $posts, 0, $r );
 
-                        if ( empty( $options_only ) )
+                        if ( empty( $r['options_only'] ) ) {
                                 $retval .= '</select>';
+                        }
 
                 // No items found - Display feedback if no custom message was passed
-                } elseif ( empty( $none_found ) ) {
+                } elseif ( empty( $r['none_found'] ) ) {
 
                         // Switch the response based on post type
-                        switch ( $post_type ) {
+                        switch ( $r['post_type'] ) {
 
                                 // Topics