Changeset 25801 for trunk/src/wp-admin/includes/update.php

Timestamp:

10/15/2013 11:02:28 PM (12 years ago)

Author:

nacin

Message:

Significantly simplify get_core_checksums(), as the caching and chunking was causing too much grief.

Make sure we only do our pre-flight is_writable check when the file exists.

see #18201. see #22704.

File:

• trunk/src/wp-admin/includes/update.php (modified) (2 diffs)

trunk/src/wp-admin/includes/update.php

@@ -92 +92 @@
 
 /**
- * Gets and caches the checksums for the given versions of WordPress
+ * Gets and caches the checksums for the given version of WordPress.
  *
  * @since 3.7.0
  *
- * @param $version string|array A single version, or an array of versions to fetch
- *
- * @return bool|array False on failure, otherwise the array of checksums, keyed by version
- */
-function get_core_checksums( $version ) {
-    if ( ! is_array( $version ) )
-        $version = array( $version );
-
+ * @param string $version Version string to query.
+ * @param string $locale  Locale to query.
+ * @return bool|array False on failure. An array of checksums on success.
+ */
+function get_core_checksums( $version, $locale ) {
     $return = array();
 
-    // Check to see if we have cached copies available, if we do, no need to request them
-    foreach ( $version as $i => $v ) {
-        if ( $checksums = get_site_transient( "core_checksums_$v" ) ) {
-            unset( $version[ $i ] );
-            $return[ $v ] = $checksums;
-        }
-    }
-
-    // We had cached copies for all of the versions!
-    if ( empty( $version ) )
-        return $return;
-
-    $url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( array( 'version' => $version ), null, '&' );
+    $url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
 
     if ( wp_http_supports( array( 'ssl' ) ) )
@@ -138 +123 @@
         return false;
 
-    // Cache the checksums for later
-    foreach ( $version as $v ) {
-        if ( ! isset( $body['checksums'][ $v ] ) )
-            $body['checksums'][ $v ] = false;
-        set_site_transient( "core_checksums_$v", $body['checksums'][ $v ], HOUR_IN_SECONDS );
-        $return[ $v ] = $body['checksums'][ $v ];
-    }
-
-    // If the API didn't return anything for a version, explicitly set it's return value to false
-    foreach ( $return as $v => $r ) {
-        if ( empty( $r ) )
-            $return[ $v ] = false;
-    }
-
-    return $return;
+    return $body['checksums'];
 }