Changeset 28407

Timestamp:

05/15/2014 02:45:01 AM (9 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in get_media_item().

To test, fire open the old media in the console: tb_show('Old Media is Weird', 'media-upload.php?type=image&TB_iframe=true&post_id=0');

See #22400.

Location:

trunk/src

Files:

• wp-admin/includes/media.php (modified) (7 diffs)
• wp-includes/bookmark-template.php (modified) (1 diff)

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

@@ -1286 +1286 @@
     $current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0;
 
-    $default_args = array( 'errors' => null, 'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true );
+    $default_args = array(
+        'errors' => null,
+        'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true,
+        'delete' => true,
+        'toggle' => true,
+        'show_title' => true
+    );
     $args = wp_parse_args( $args, $default_args );
 
@@ -1298 +1304 @@
      * @param array $args An array of arguments.
      */
-    $args = apply_filters( 'get_media_item_args', $args );
-    extract( $args, EXTR_SKIP );
+    $r = apply_filters( 'get_media_item_args', $args );
 
     $toggle_on  = __( 'Show' );
@@ -1312 +1317 @@
     $type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
 
-    $form_fields = get_attachment_fields_to_edit( $post, $errors );
-
-    if ( $toggle ) {
-        $class = empty( $errors ) ? 'startclosed' : 'startopen';
+    $form_fields = get_attachment_fields_to_edit( $post, $r['errors'] );
+
+    if ( $r['toggle'] ) {
+        $class = empty( $r['errors'] ) ? 'startclosed' : 'startopen';
         $toggle_links = "
     <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
@@ -1325 +1330 @@
 
     $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
-    $display_title = $show_title ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . "</span></div>" : '';
+    $display_title = $r['show_title'] ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . "</span></div>" : '';
 
     $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
@@ -1399 +1404 @@
     );
 
-    if ( $send )
-        $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
+    if ( $r['send'] ) {
+        $r['send'] = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
+    }
+
+    $delete = empty( $r['delete'] ) ? '' : $r['delete'];
     if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
         if ( !EMPTY_TRASH_DAYS ) {
@@ -1420 +1428 @@
     $thumbnail = '';
     $calling_post_id = 0;
-    if ( isset( $_GET['post_id'] ) )
+    if ( isset( $_GET['post_id'] ) ) {
         $calling_post_id = absint( $_GET['post_id'] );
-    elseif ( isset( $_POST ) && count( $_POST ) ) // Like for async-upload where $_GET['post_id'] isn't set
+    } elseif ( isset( $_POST ) && count( $_POST ) ) {// Like for async-upload where $_GET['post_id'] isn't set
         $calling_post_id = $post->post_parent;
+    }
     if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) )
         && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
@@ -1430 +1439 @@
     }
 
-    if ( ( $send || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) )
-        $form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>$send $thumbnail $delete</td></tr>\n" );
-
+    if ( ( $r['send'] || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) ) {
+        $form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>" . $r['send'] . " $thumbnail $delete</td></tr>\n" );
+    }
     $hidden_fields = array();
 

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

@@ -242 +242 @@
     }
 
-    if ( $categorize ) {
+    if ( $r['categorize'] ) {
         // Split the bookmarks into ul's for each category
         foreach ( (array) $cats as $cat ) {