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

Customize: Remove use of reserved word `default` in Underscore template which breaks IE8. 

Fixes regression introduced in r30712.

Props adamsilverstein.
Fixes #36793.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2016-05-11 19:07:30 +00:00
parent 64fb1a9e90
commit b074113016
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,7 +214,7 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
</div> </div>
<div class="actions"> <div class="actions">
<# if ( data.defaultAttachment ) { #> <# if ( data.defaultAttachment ) { #>
<button type="button" class="button default-button">{{ data.button_labels.default }}</button> <button type="button" class="button default-button">{{ data.button_labels['default'] }}</button>
<# } #> <# } #>
<# if ( data.canUpload ) { #> <# if ( data.canUpload ) { #>
<button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button">{{ data.button_labels.select }}</button> <button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button">{{ data.button_labels.select }}</button>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37416'; $wp_version = '4.6-alpha-37417';
/** /**
* 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.