Changeset 18227

Timestamp:

06/10/2011 06:22:33 AM (14 years ago)

Author:

nacin

Message:

Extra check for partial updates: Make sure the API response matches the current version of WP. see #10611.

Location:

trunk

Files:

• wp-admin/includes/class-wp-upgrader.php (modified) (2 diffs)
• wp-includes/update.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -868 +868 @@
 
     function upgrade($current) {
-        global $wp_filesystem;
+        global $wp_filesystem, $wp_version;
 
         $this->init();
@@ -890 +890 @@
         // Don't though if the constant is set to skip bundled items.
         // If the API returns a no_content zip, go with it. Finally, default to the full zip.
-        if ( $current->packages->partial && 'reinstall' != $current->response )
+        if ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version )
             $to_download = 'partial';
         elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )

trunk/wp-includes/update.php

@@ -92 +92 @@
                 $offer[ $offer_key ] = esc_html( $value );
         }
-        $offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download',
-            'locale', 'packages', 'current', 'php_version', 'mysql_version', 'new_bundled' ), '' ) );
+        $offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download', 'locale',
+            'packages', 'current', 'php_version', 'mysql_version', 'new_bundled', 'partial_version' ), '' ) );
     }