Customize: Separate preview and actions in the site icon control.

Reverts [37456] to allow users to remove/change a site icon even if the attachment has corrupt/missing data about sizes.

Merge of [37724] to the 4.5 branch.

See #36749.
Built from https://develop.svn.wordpress.org/branches/4.5@37725


git-svn-id: http://core.svn.wordpress.org/branches/4.5@37691 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-06-16 09:53:28 +00:00
parent e09e36af80
commit c3a292dc76
2 changed files with 3 additions and 1 deletions

View File

@ -60,6 +60,7 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
</label>
<# if ( data.attachment && data.attachment.id ) { #>
<# if ( data.attachment.sizes ) { #>
<div class="current">
<div class="container">
<div class="site-icon-preview">
@ -75,6 +76,7 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
</div>
</div>
</div>
<# } #>
<div class="actions">
<# if ( data.canUpload ) { #>
<button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>

View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5.3-alpha-37711';
$wp_version = '4.5.3-alpha-37725';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.