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

Themes: After [38788], further improve the update button when there's no update package. 

Prevents running shiny install when no package exists.


Fixes #37774.
Built from https://develop.svn.wordpress.org/trunk@38855


git-svn-id: http://core.svn.wordpress.org/trunk@38798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Pascal Birchler 2016-10-21 10:36:46 +00:00
parent 11a13f147b
commit f88c248a52
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/js/theme.js
View File

@ -610,6 +610,11 @@ themes.view.Theme = wp.Backbone.View.extend({
updateTheme: function( event ) { updateTheme: function( event ) {
var _this = this; var _this = this;
if ( ! this.model.get( 'hasPackage' ) ) {
return;
}
event.preventDefault(); event.preventDefault();
wp.updates.maybeRequestFilesystemCredentials( event ); wp.updates.maybeRequestFilesystemCredentials( event );

2
wp-admin/js/theme.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
wp-admin/themes.php
View File

@ -252,7 +252,11 @@ foreach ( $themes as $theme ) :
<?php if ( $theme['hasUpdate'] ) : ?> <?php if ( $theme['hasUpdate'] ) : ?>
<div class="update-message notice inline notice-warning notice-alt"> <div class="update-message notice inline notice-warning notice-alt">
<?php if ( $theme['hasPackage'] ) : ?>
<p><?php _e( 'New version available. <button class="button-link" type="button">Update now</button>' ); ?></p> <p><?php _e( 'New version available. <button class="button-link" type="button">Update now</button>' ); ?></p>
<?php else : ?>
<p><?php _e( 'New version available.' ); ?></p>
<?php endif; ?>
</div> </div>
<?php endif; ?> <?php endif; ?>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38854'; $wp_version = '4.7-alpha-38855';
/** /**
* 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.