Changeset 28410

Timestamp:

05/15/2014 03:08:46 AM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in wp_terms_checklist().

See #22400.

File:

• trunk/src/wp-admin/includes/template.php (modified) (3 diffs)

trunk/src/wp-admin/includes/template.php

@@ -137 +137 @@
  * @param array $args
  */
-function wp_terms_checklist($post_id = 0, $args = array()) {
+function wp_terms_checklist( $post_id = 0, $args = array() ) {
         $defaults = array(
                 'descendants_and_self' => 0,
@@ -157 +157 @@
          * @param int   $post_id The post ID.
          */
-        $args = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
-
-        extract( wp_parse_args($args, $defaults), EXTR_SKIP );
-
-        if ( empty($walker) || !is_a($walker, 'Walker') )
+        $params = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
+
+        $r = wp_parse_args( $params, $defaults );
+
+        if ( empty( $r['walker'] ) || ! is_a( $r['walker'], 'Walker' ) ) {
                 $walker = new Walker_Category_Checklist;
-
-        $descendants_and_self = (int) $descendants_and_self;
-
-        $args = array('taxonomy' => $taxonomy);
-
-        $tax = get_taxonomy($taxonomy);
-        $args['disabled'] = !current_user_can($tax->cap->assign_terms);
-
-        if ( is_array( $selected_cats ) )
-                $args['selected_cats'] = $selected_cats;
-        elseif ( $post_id )
-                $args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
-        else
+        } else {
+                $walker = $r['walker'];
+        }
+
+        $taxonomy = $r['taxonomy'];
+        $descendants_and_self = (int) $r['descendants_and_self'];
+
+        $args = array( 'taxonomy' => $taxonomy );
+
+        $tax = get_taxonomy( $taxonomy );
+        $args['disabled'] = ! current_user_can( $tax->cap->assign_terms );
+
+        if ( is_array( $r['selected_cats'] ) ) {
+                $args['selected_cats'] = $r['selected_cats'];
+        } elseif ( $post_id ) {
+                $args['selected_cats'] = wp_get_object_terms( $post_id, $taxonomy, array_merge( $args, array( 'fields' => 'ids' ) ) );
+        } else {
                 $args['selected_cats'] = array();
-
-        if ( is_array( $popular_cats ) )
-                $args['popular_cats'] = $popular_cats;
-        else
-                $args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
-
+        }
+        if ( is_array( $r['popular_cats'] ) ) {
+                $args['popular_cats'] = $r['popular_cats'];
+        } else {
+                $args['popular_cats'] = get_terms( $taxonomy, array(
+                        'fields' => 'ids',
+                        'orderby' => 'count',
+                        'order' => 'DESC',
+                        'number' => 10,
+                        'hierarchical' => false
+                ) );
+        }
         if ( $descendants_and_self ) {
-                $categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
+                $categories = (array) get_terms( $taxonomy, array(
+                        'child_of' => $descendants_and_self,
+                        'hierarchical' => 0,
+                        'hide_empty' => 0
+                ) );
                 $self = get_term( $descendants_and_self, $taxonomy );
                 array_unshift( $categories, $self );
         } else {
-                $categories = (array) get_terms($taxonomy, array('get' => 'all'));
-        }
-
-        if ( $checked_ontop ) {
+                $categories = (array) get_terms( $taxonomy, array( 'get' => 'all' ) );
+        }
+
+        if ( $r['checked_ontop'] ) {
                 // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
                 $checked_categories = array();
@@ -204 +218 @@
 
                 // Put checked cats on top
-                echo call_user_func_array(array(&$walker, 'walk'), array($checked_categories, 0, $args));
+                echo call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) );
         }
         // Then the rest of them
-        echo call_user_func_array(array(&$walker, 'walk'), array($categories, 0, $args));
+        echo call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
 }