Changeset 28391

Timestamp:

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

Author:

wonderboymusic

Message:

Eliminate use of extract() in post_tags_meta_box() and post_categories_meta_box().

Both functions only need to read taxonomy, yet they extract every available variable from $box['args']. Even if those variables were useful, there is no attempt to pass them to anything, and scope in PHP does not allow them to be scooped up by inner functions without being passed directly.

See #22400.

File:

• trunk/src/wp-admin/includes/meta-boxes.php (modified) (2 diffs)

trunk/src/wp-admin/includes/meta-boxes.php

@@ -373 +373 @@
  * @param object $post
  */
-function post_tags_meta_box($post, $box) {
-        $defaults = array('taxonomy' => 'post_tag');
-        if ( !isset($box['args']) || !is_array($box['args']) )
+function post_tags_meta_box( $post, $box ) {
+        $defaults = array( 'taxonomy' => 'post_tag' );
+        if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
                 $args = array();
-        else
+        } else {
                 $args = $box['args'];
-        extract( wp_parse_args($args, $defaults), EXTR_SKIP );
-        $tax_name = esc_attr($taxonomy);
-        $taxonomy = get_taxonomy($taxonomy);
+        }
+        $r = wp_parse_args( $args, $defaults );
+        $tax = $r['taxonomy'];
+        $tax_name = esc_attr( $tax );
+        $taxonomy = get_taxonomy( $tax );
         $user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
         $comma = _x( ',', 'tag delimiter' );
@@ -416 +418 @@
  */
 function post_categories_meta_box( $post, $box ) {
-        $defaults = array('taxonomy' => 'category');
-        if ( !isset($box['args']) || !is_array($box['args']) )
+        $defaults = array( 'taxonomy' => 'category' );
+        if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
                 $args = array();
-        else
+        } else {
                 $args = $box['args'];
-        extract( wp_parse_args($args, $defaults), EXTR_SKIP );
-        $tax = get_taxonomy($taxonomy);
-
+        }
+        $r = wp_parse_args( $args, $defaults );
+        $taxonomy = $r['taxonomy'];
+        $tax = get_taxonomy( $taxonomy );
         ?>
         <div id="taxonomy-<?php echo $taxonomy; ?>" class="categorydiv">