Changeset 18225

Timestamp:

06/10/2011 05:47:44 AM (14 years ago)

Author:

nacin

Message:

Core support for partial updates. see #10611.

Location:

trunk

Files:

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

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

@@ -886 +886 @@
         $wp_dir = trailingslashit($wp_filesystem->abspath());
 
-        $download = $this->download_package( $current->package );
+        // 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.
+        // 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 )
+            $to_download = 'partial';
+        elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
+            && ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) )
+            $to_download = 'new_bundled';
+        elseif ( $current->packages->no_content )
+            $to_download = 'no_content';
+        else
+            $to_download = 'full';
+
+        $download = $this->download_package( $current->packages->$to_download );
         if ( is_wp_error($download) )
             return $download;

trunk/wp-admin/update-core.php

@@ -72 +72 @@
             submit_button( $submit, 'button', 'upgrade', false );
         }
-        echo '&nbsp;<a href="' . esc_url( $update->package ) . '" class="button">' . $download . '</a>&nbsp;';
+        echo '&nbsp;<a href="' . esc_url( $update->download ) . '" class="button">' . $download . '</a>&nbsp;';
     }
     if ( 'en_US' != $update->locale )

trunk/wp-includes/update.php

@@ -59 +59 @@
 
     $local_package = isset( $wp_local_package )? $wp_local_package : '';
-    $url = "http://api.wordpress.org/core/version-check/1.5/?version=$wp_version&php=$php_version&locale=$locale&mysql=$mysql_version&local_package=$local_package&blogs=$num_blogs&users={$user_count['total_users']}&multisite_enabled=$multisite_enabled";
+    $url = "http://api.wordpress.org/core/version-check/1.6-beta/?version=$wp_version&php=$php_version&locale=$locale&mysql=$mysql_version&local_package=$local_package&blogs=$num_blogs&users={$user_count['total_users']}&multisite_enabled=$multisite_enabled";
 
     $options = array(
@@ -76 +76 @@
 
     $body = trim( wp_remote_retrieve_body( $response ) );
-    $body = str_replace(array("\r\n", "\r"), "\n", $body);
-    $new_options = array();
-    foreach ( explode( "\n\n", $body ) as $entry ) {
-        $returns = explode("\n", $entry);
-        $new_option = new stdClass();
-        $new_option->response = esc_attr( $returns[0] );
-        if ( isset( $returns[1] ) )
-            $new_option->url = esc_url( $returns[1] );
-        if ( isset( $returns[2] ) )
-            $new_option->package = esc_url( $returns[2] );
-        if ( isset( $returns[3] ) )
-            $new_option->current = esc_attr( $returns[3] );
-        if ( isset( $returns[4] ) )
-            $new_option->locale = esc_attr( $returns[4] );
-        if ( isset( $returns[5] ) )
-            $new_option->php_version = esc_attr( $returns[5] );
-        if ( isset( $returns[6] ) )
-            $new_option->mysql_version = esc_attr( $returns[6] );
-        $new_options[] = $new_option;
+    if ( ! $body = maybe_unserialize( $body ) )
+        return false;
+    if ( ! isset( $body['offers'] ) )
+        return false;
+    $offers = $body['offers'];
+
+    foreach ( $offers as &$offer ) {
+        foreach ( $offer as $offer_key => $value ) {
+            if ( 'packages' == $offer_key )
+                $offer['packages'] = (object) array_intersect_key( array_map( 'esc_url', $offer['packages'] ), array_fill_keys( array( 'full', 'no_content', 'new_bundled', 'partial' ), '' ) );
+            elseif ( 'download' == $offer_key )
+                $offer['download'] = esc_url( $value );
+            else
+                $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' ), '' ) );
     }
 
     $updates = new stdClass();
-    $updates->updates = $new_options;
+    $updates->updates = $offers;
     $updates->last_checked = time();
     $updates->version_checked = $wp_version;

trunk/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 17517;
+$wp_db_version = 18220;
 
 /**