Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge two class attributes in WP_Customize_Media_Control::content_template() and wp_print_media_templates().

Browse Source 
props nicholas_io.
fixes #32896.
Built from https://develop.svn.wordpress.org/trunk@33090


git-svn-id: http://core.svn.wordpress.org/trunk@33061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-07-06 14:19:26 +00:00
parent a3c1814cc2
commit fa1b659d29
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-customize-control.php
View File

@ -814,7 +814,7 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
</video> </video>
</div> </div>
<# } else { #> <# } else { #>
<img class="attachment-thumb type-icon" src="{{ data.attachment.icon }}" class="icon" draggable="false" /> <img class="attachment-thumb type-icon icon" src="{{ data.attachment.icon }}" draggable="false" />
<p class="attachment-title">{{ data.attachment.title }}</p> <p class="attachment-title">{{ data.attachment.title }}</p>
<# } #> <# } #>
</div> </div>

2
wp-includes/media-template.php
View File

@ -298,7 +298,7 @@ function wp_print_media_templates() {
<# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #> <# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #>
<img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" /> <img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" />
<# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #> <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
<img class="details-image" src="{{ data.icon }}" class="icon" draggable="false" /> <img class="details-image icon" src="{{ data.icon }}" draggable="false" />
<# } #> <# } #>
<# if ( 'audio' === data.type ) { #> <# if ( 'audio' === data.type ) { #>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-beta1-33089'; $wp_version = '4.3-beta1-33090';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.