WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Customize: Improve the labelling of background and header images in the list mode of the media library. 

Props deltafactory, coreymcollins, desrosj
Fixes #22857

Built from https://develop.svn.wordpress.org/trunk@38831


git-svn-id: http://core.svn.wordpress.org/trunk@38774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-10-19 23:03:31 +00:00
parent 8abba71d47
commit f5a3446e4d
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
wp-admin/includes/template.php
View File

@ -1752,14 +1752,39 @@ function _media_states( $post ) {
if ( current_theme_supports( 'custom-header') ) {
$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true );
if ( ! empty( $meta_header ) && $meta_header == $stylesheet )
$media_states[] = __( 'Header Image' );
if ( is_random_header_image() ) {
$header_images = wp_list_pluck( get_uploaded_header_images(), 'attachment_id' );
if ( $meta_header == $stylesheet && in_array( $post->ID, $header_images ) ) {
$media_states[] = __( 'Header Image' );
}
} else {
$header_image = get_header_image();
// Display "Header Image" if the image was ever used as a header image
if ( ! empty( $meta_header ) && $meta_header == $stylesheet && $header_image !== wp_get_attachment_url( $post->ID ) ) {
$media_states[] = __( 'Header Image' );
}
// Display "Current Header Image" if the image is currently the header image
if ( $header_image && $header_image == wp_get_attachment_url( $post->ID ) ) {
$media_states[] = __( 'Current Header Image' );
}
}
}
if ( current_theme_supports( 'custom-background') ) {
$meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true );
if ( ! empty( $meta_background ) && $meta_background == $stylesheet )
if ( ! empty( $meta_background ) && $meta_background == $stylesheet ) {
$media_states[] = __( 'Background Image' );
$background_image = get_background_image();
if ( $background_image && $background_image == wp_get_attachment_url( $post->ID ) ) {
$media_states[] = __( 'Current Background Image' );
}
}
}
if ( $post->ID == get_option( 'site_icon' ) ) {

2
wp-includes/version.php
View File

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