Ticket #32860: 32860.diff

src/wp-admin/includes/class-wp-site-icon.php

@@ -176 +176 @@
                 ?>
                 <p class="hide-if-no-js">
                         <label class="screen-reader-text" for="choose-from-library-link"><?php _e( 'Choose an image from your media library:' ); ?></label>
-                        <button type="button" id="choose-from-library-link" class="button" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+                        <button type="button" id="choose-from-library-link" class="button" data-size="<?php echo absint( $this->min_size ); ?>" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Choose Image' ); ?></button>
                 </p>
                 <form class="hide-if-js" action="<?php echo esc_url( admin_url( 'options-general.php?page=site-icon' ) ); ?>" method="post" enctype="multipart/form-data">
                         <input name="action" value="crop_site_icon" type="hidden" />

src/wp-admin/js/site-icon.js

@@ -3 +3 @@
 
         $( function() {
                 // Build the choose from library frame.
-                $( '#choose-from-library-link' ).click( function( event ) {
+                $( '#choose-from-library-link' ).on( 'click', function( event ) {
                         var $el = $(this);
                         event.preventDefault();
 
@@ -14 +14 @@
                         }
 
                         // Create the media frame.
-                        frame = wp.media.frames.customHeader = wp.media({
-                                // Set the title of the modal.
-                                title: $el.data('choose'),
-
-                                // Tell the modal to show only images.
-                                library: {
-                                        type: 'image'
-                                },
-
+                        frame = wp.media({
                                 // Customize the submit button.
                                 button: {
                                         // Set the text of the button.
@@ -30 +22 @@
                                         // Tell the button not to close the modal, since we're
                                         // going to refresh the page when the image is selected.
                                         close: false
-                                }
+                                },
+                                states: [
+                                        new wp.media.controller.Library({
+                                                title:           $el.data( 'choose' ),
+                                                library:         wp.media.query({ type: 'image' }),
+                                                multiple:        false,
+                                                date:            false,
+                                                suggestedWidth:  $el.data( 'size' ),
+                                                suggestedHeight: $el.data( 'size' )
+                                        })
+                                ]
                         });
 
                         // When an image is selected, run a callback.

src/wp-admin/options-general.php

@@ -146 +146 @@
         <img class="avatar avatar-150" src="<?php site_icon_url( null, 150 ); ?>" height="150" width="150" />
         <p class="hide-if-no-js">
                 <label class="screen-reader-text" for="choose-from-library-link"><?php _e( 'Choose an image from your media library:' ); ?></label>
-                <button type="button" id="choose-from-library-link" class="button" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Update Site Icon' ); ?></button>
+                <button type="button" id="choose-from-library-link" class="button" data-size="<?php echo absint( $GLOBALS['wp_site_icon']->min_size ); ?>" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Update Site Icon' ); ?></button>
                 <a href="<?php echo esc_url( $remove_url ); ?>"><?php _e( 'Remove Site Icon' ); ?></a>
         </p>
         <p class="hide-if-js">