Ticket #22400: 22400.media.php.diff

wp-admin/includes/media.php

@@ -1064 +1064 @@
         $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 );
         $args = apply_filters( 'get_media_item_args', $args );
-        extract( $args, EXTR_SKIP );
 
         $toggle_on  = __( 'Show' );
         $toggle_off = __( 'Hide' );
@@ -1083 +1082 @@
         $type = array_shift( $keys );
         $type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
 
-        $form_fields = get_attachment_fields_to_edit( $post, $errors );
+        $form_fields = get_attachment_fields_to_edit( $post, $args['errors'] );
 
-        if ( $toggle ) {
-                $class = empty( $errors ) ? 'startclosed' : 'startopen';
+        if ( $args['toggle'] ) {
+                $class = empty( $args['errors'] ) ? 'startclosed' : 'startopen';
                 $toggle_links = "
         <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
         <a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
@@ -1096 +1095 @@
         }
 
         $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 ) . "</span></div>" : '';
+        $display_title = $args['show_title'] ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60 ) . "</span></div>" : '';
 
         $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
         $order = '';
@@ -1161 +1160 @@
                 'extra_rows' => array(),
         );
 
-        if ( $send )
-                $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
-        if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
+        if ( $args['send'] )
+                $args['send'] = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
+        if ( $args['delete'] && current_user_can( 'delete_post', $attachment_id ) ) {
                 if ( !EMPTY_TRASH_DAYS ) {
-                        $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete-permanently'>" . __( 'Delete Permanently' ) . '</a>';
+                        $args['delete'] = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete-permanently'>" . __( 'Delete Permanently' ) . '</a>';
                 } elseif ( !MEDIA_TRASH ) {
-                        $delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
+                        $args['delete'] = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
                          <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'><p>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "</p>
                          <a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
                          <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
                          </div>";
                 } else {
-                        $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
+                        $args['delete'] = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
                         <a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
                 }
         } else {
-                $delete = '';
+                $args['delete'] = '';
         }
 
         $thumbnail = '';
@@ -1192 +1191 @@
                 $thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html__( "Use as featured image" ) . "</a>";
         }
 
-        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 ( ( $args['send'] || $thumbnail || $args['delete'] ) && !isset( $form_fields['buttons'] ) )
+                $form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>". $args['send'] . $thumbnail . $args['delete'] ."</td></tr>\n" );
 
         $hidden_fields = array();