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

Don't use a double negative. 

props TobiasBg.
fixes #18201.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25590 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-02 21:50:09 +00:00
parent 80bac8fe09
commit be366723d2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/class-wp-upgrader.php
View File

@ -1254,11 +1254,11 @@ class Core_Upgrader extends WP_Upgrader {
// Pre-cache the checksums for the versions we care about // Pre-cache the checksums for the versions we care about
get_core_checksums( array( $wp_version, $current->version ) ); get_core_checksums( array( $wp_version, $current->version ) );
$no_partial = false; $partial = true;
if ( $parsed_args['do_rollback'] ) if ( $parsed_args['do_rollback'] )
$no_partial = true; $partial = false;
elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() ) elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() )
$no_partial = true; $partial = false;
// If partial update is returned from the API, use that, unless we're doing a reinstall. // If partial update is returned from the API, use that, unless we're doing a reinstall.
// If we cross the new_bundled version number, then use the new_bundled zip. // If we cross the new_bundled version number, then use the new_bundled zip.
@ -1266,7 +1266,7 @@ class Core_Upgrader extends WP_Upgrader {
// If the API returns a no_content zip, go with it. Finally, default to the full zip. // If the API returns a no_content zip, go with it. Finally, default to the full zip.
if ( $parsed_args['do_rollback'] && $current->packages->rollback ) if ( $parsed_args['do_rollback'] && $current->packages->rollback )
$to_download = 'rollback'; $to_download = 'rollback';
elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && ! $no_partial ) elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial )
$to_download = 'partial'; $to_download = 'partial';
elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' ) elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
&& ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) && ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) )