Ticket #31352: 31352.3.diff

src/wp-admin/edit-form-comment.php

@@ -16 +16 @@
 <h2><?php _e('Edit Comment'); ?></h2>
 
 <div id="poststuff">
+<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID; ?>" />
 <input type="hidden" name="action" value="editedcomment" />
 <input type="hidden" name="comment_ID" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
 <input type="hidden" name="comment_post_ID" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />

src/wp-admin/includes/class-wp-media-list-table.php

@@ -313 +313 @@
                 $attributes = 'class="column-icon media-icon ' . $mime . '-icon"' . $style;
 ?>
                 <td <?php echo $attributes ?>><?php
-                        if ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) {
+                        if ( $thumb = wp_get_attachment_image_src( $post->ID, array( 40, 40 ), true ) ) {
+
+                                list( $src, $width, $height ) = $thumb;
+
+                                if ( 'image' != $mime ) {
+                                        // Grab the icon src and create a 2x srcset
+                                        $img_filename = substr( $src, 0, strrpos( $src, '.' ) );
+                                        $srcset = str_replace( $img_filename, $img_filename . '-2x', $src );
+                                        $img_html = '<img src="' . $src . '" srcset="' . $srcset . ' 2x" width="' . $width . '" height="' . $height . '" alt="' . $mime . ' icon" />';
+                                } else {
+                                        $img_html = '<img src="' . $src . '" width="' . $width . '" height="' . $height . '" alt="' . $mime . ' icon" />';
+                                }
+
                                 if ( $this->is_trash || ! $user_can_edit ) {
-                                        echo $thumb;
+                                        echo $img_html;
                                 } else {
 ?>
                                 <a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ); ?>">
-                                        <?php echo $thumb; ?>
+                                        <?php echo $img_html; ?>
                                 </a>
 
 <?php                   }

src/wp-admin/includes/class-wp-press-this.php

@@ -793 +793 @@
                                 <span class="dashicons dashicons-search"></span><span class="screen-reader-text"><?php _e( 'Search categories' ); ?></span>
                         </label>
                 </div>
-                <div role="application" aria-label="<?php esc_attr_e( 'Categories' ); ?>">
-                        <ul class="categories-select">
-                                <?php wp_terms_checklist( $post->ID, array( 'taxonomy' => 'category', 'list_only' => true ) ); ?>
-                        </ul>
-                </div>
+                <ul class="categories-select" aria-label="<?php esc_attr_e( 'Categories' ); ?>">
+                        <?php wp_terms_checklist( $post->ID, array( 'taxonomy' => 'category', 'list_only' => true ) ); ?>
+                </ul>
                 <?php
         }
 

src/wp-admin/user-new.php

@@ -402 +402 @@
                 </td>
         </tr>
         <tr>
-                <th scope="row"><?php _e('Send Password?') ?></th>
+                <th scope="row"><label for="send_password"><?php _e('Send Password?') ?></label></th>
                 <td><label for="send_password"><input type="checkbox" name="send_password" id="send_password" value="1" <?php checked( $new_user_send_password ); ?> /> <?php _e('Send this password to the new user by email.'); ?></label></td>
         </tr>
 <?php endif; ?>

src/wp-includes/js/media/views.js

@@ -2721 +2721 @@
                         options.size = this.imageSize();
                 }
 
+                // add support for retina icons
+                if ( '' !== options.icon ) {
+                        options.icon2x = options.icon.replace('.png', '-2x.png');
+                }
+
                 options.can = {};
                 if ( options.nonces ) {
                         options.can.remove = !! options.nonces['delete'];

src/wp-includes/media-template.php

@@ -297 +297 @@
                                 <# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #>
                                         <img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" />
                                 <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
-                                        <img class="details-image" src="{{ data.icon }}" class="icon" draggable="false" />
+                                        <img class="details-image" src="{{ data.icon }}" srcset="{{ data.icon2x }} 2x" class="icon" draggable="false" />
                                 <# } #>
 
                                 <# if ( 'audio' === data.type ) { #>
@@ -461 +461 @@
                                                 <# if ( data.image && data.image.src && data.image.src !== data.icon ) { #>
                                                         <img src="{{ data.image.src }}" class="thumbnail" draggable="false" />
                                                 <# } else { #>
-                                                        <img src="{{ data.icon }}" class="icon" draggable="false" />
+                                                        <img src="{{ data.icon }}" srcset="{{ data.icon2x}} 2x" class="icon" draggable="false" />
                                                 <# } #>
                                         </div>
                                         <div class="filename">
@@ -511 +511 @@
                                 <# } else if ( 'image' === data.type && data.sizes ) { #>
                                         <img src="{{ data.size.url }}" draggable="false" />
                                 <# } else { #>
-                                        <img src="{{ data.icon }}" class="icon" draggable="false" />
+                                        <img src="{{ data.icon }}" srcset="{{ data.icon2x }} 2x" class="icon" draggable="false" />
                                 <# } #>
                         </div>
                         <div class="details">