Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17245 from woocommerce/fix/17216 

Modal should only display for major updates
This commit is contained in:
Claudio Sanches 2017-10-16 22:33:00 -07:00 committed by GitHub
parent 1f7a038bcd 47a609edb7
commit 46c15b235a
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/admin/plugin-updates/class-wc-plugins-screen-updates.php
View File

@ -46,12 +46,12 @@ class WC_Plugins_Screen_Updates extends WC_Plugin_Updates {
$new_version_parts = explode( '.', $this->new_version );
// If user has already moved to the minor version, we don't need to flag up anything.
if ( version_compare( $current_version_parts[0] . $current_version_parts[1], $new_version_parts[0] . $new_version_parts[1], '=' ) ) {
if ( version_compare( $current_version_parts[0] . '.' . $current_version_parts[1], $new_version_parts[0] . '.' . $new_version_parts[1], '=' ) ) {
return;
}
// If user has already moved to the major version, we should only shown minor notices and assume everything is "ok" for major.
if ( version_compare( $current_version_parts[0] . $current_version_parts[1], $new_version_parts[0] . '0', '>=' ) ) {
if ( version_compare( $current_version_parts[0] . '.' . $current_version_parts[1], $new_version_parts[0] . '.0', '>=' ) ) {
$this->major_untested_plugins = array();
}

14
includes/admin/plugin-updates/class-wc-updates-screen-updates.php
View File

@ -37,13 +37,25 @@ class WC_Updates_Screen_Updates extends WC_Plugin_Updates {
$this->new_version = wc_clean( $updateable_plugins['woocommerce/woocommerce.php']->update->new_version );
$this->major_untested_plugins = $this->get_untested_plugins( $this->new_version, 'major' );
if ( empty( $this->major_untested_plugins ) ) {
$current_version_parts = explode( '.', WC_VERSION );
$new_version_parts = explode( '.', $this->new_version );
// If user has already moved to the minor version, we don't need to flag up anything.
if ( version_compare( $current_version_parts[0] . '.' . $current_version_parts[1], $new_version_parts[0] . '.' . $new_version_parts[1], '=' ) ) {
return;
}
// If user has already moved to the major version, we should only shown minor notices and assume everything is "ok" for major.
if ( version_compare( $current_version_parts[0] . '.' . $current_version_parts[1], $new_version_parts[0] . '.0', '>=' ) ) {
$this->major_untested_plugins = array();
}
if ( ! empty( $this->major_untested_plugins ) ) {
echo $this->get_extensions_modal_warning();
$this->update_screen_modal_js();
}
}
/**
* JS for the modal window on the updates screen.