Changeset 28411

Timestamp:

05/15/2014 03:13:44 AM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in Walker_Category_Checklist::start_el().

See #22400.

File:

• trunk/src/wp-admin/includes/template.php (modified) (1 diff)

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

@@ -71 +71 @@
          */
         function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-                extract($args);
-                if ( empty($taxonomy) )
+                if ( empty( $args['taxonomy'] ) ) {
                         $taxonomy = 'category';
-
-                if ( $taxonomy == 'category' )
+                } else {
+                        $taxonomy = $args['taxonomy'];
+                }
+
+                if ( $taxonomy == 'category' ) {
                         $name = 'post_category';
-                else
-                        $name = 'tax_input['.$taxonomy.']';
-
-                $class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : '';
+                } else {
+                        $name = 'tax_input[' . $taxonomy . ']';
+                }
+                $args['popular_cats'] = empty( $args['popular_cats'] ) ? array() : $args['popular_cats'];
+                $class = in_array( $category->term_id, $args['popular_cats'] ) ? ' class="popular-category"' : '';
+
+                $args['selected_cats'] = empty( $args['selected_cats'] ) ? array() : $args['selected_cats'];
 
                 /** This filter is documented in wp-includes/category-template.php */
-                $output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" . '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' . checked( in_array( $category->term_id, $selected_cats ), true, false ) . disabled( empty( $args['disabled'] ), false, false ) . ' /> ' . esc_html( apply_filters( 'the_category', $category->name ) ) . '</label>';
+                $output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" .
+                        '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' .
+                        checked( in_array( $category->term_id, $args['selected_cats'] ), true, false ) .
+                        disabled( empty( $args['disabled'] ), false, false ) . ' /> ' .
+                        esc_html( apply_filters( 'the_category', $category->name ) ) . '</label>';
         }