Changes in trunk/wp-includes/update.php [17231:18227]

File:

• trunk/wp-includes/update.php (modified) (8 diffs)

trunk/wp-includes/update.php

@@ -24 +24 @@
         return;
 
-    global $wp_version, $wpdb, $wp_local_package;
+    global $wpdb, $wp_local_package;
+    include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
     $php_version = phpversion();
 
@@ -58 +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(
@@ -71 +72 @@
     $response = wp_remote_get($url, $options);
 
-    if ( is_wp_error( $response ) )
-        return false;
-
-    if ( 200 != $response['response']['code'] )
-        return false;
-
-    $body = trim( $response['body'] );
-    $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 ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+        return false;
+
+    $body = trim( wp_remote_retrieve_body( $response ) );
+    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', 'partial_version' ), '' ) );
     }
 
     $updates = new stdClass();
-    $updates->updates = $new_options;
+    $updates->updates = $offers;
     $updates->last_checked = time();
     $updates->version_checked = $wp_version;
@@ -120 +117 @@
  */
 function wp_update_plugins() {
-    global $wp_version;
+    include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
 
     if ( defined('WP_INSTALLING') )
@@ -175 +172 @@
     $raw_response = wp_remote_post('http://api.wordpress.org/plugins/update-check/1.0/', $options);
 
-    if ( is_wp_error( $raw_response ) )
-        return false;
-
-    if ( 200 != $raw_response['response']['code'] )
-        return false;
-
-    $response = unserialize( $raw_response['body'] );
+    if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
+        return false;
+
+    $response = unserialize( wp_remote_retrieve_body( $raw_response ) );
 
     if ( false !== $response )
@@ -204 +198 @@
  * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
  */
-function wp_update_themes( ) {
-    global $wp_version;
+function wp_update_themes() {
+    include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
 
     if ( defined( 'WP_INSTALLING' ) )
@@ -273 +267 @@
     $raw_response = wp_remote_post( 'http://api.wordpress.org/themes/update-check/1.0/', $options );
 
-    if ( is_wp_error( $raw_response ) )
-        return false;
-
-    if ( 200 != $raw_response['response']['code'] )
+    if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
         return false;
 
     $new_update = new stdClass;
     $new_update->last_checked = time( );
-    $response = unserialize( $raw_response['body'] );
-    if ( $response ) {
-        $new_update->checked = $checked;
+    $new_update->checked = $checked;
+
+    $response = unserialize( wp_remote_retrieve_body( $raw_response ) );
+    if ( false !== $response )
         $new_update->response = $response;
-    }
 
     set_site_transient( 'update_themes', $new_update );
@@ -291 +282 @@
 
 function _maybe_update_core() {
-    global $wp_version;
+    include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
 
     $current = get_site_transient( 'update_core' );