Changeset 25805

Timestamp:

10/16/2013 04:01:12 AM (13 years ago)

Author:

nacin

Message:

Avoid numerous potential PHP warnings when dealing with the pre-r25801 get_core_checksums() return value.

Warnings included current(), filestat(), and md5_file().

see #18201. see #22704.

File:

• trunk/src/wp-admin/includes/update-core.php (modified) (1 diff)

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

@@ -698 +698 @@
         if ( function_exists( 'get_core_checksums' ) ) {
                 $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
-                if ( is_array( current( $checksums ) ) ) // Compat code for 3.7-beta2
-                        $checksums = current( $checksums );
+                if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) )
+                        $checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2
                 if ( is_array( $checksums ) ) {
                         foreach( $checksums as $file => $checksum ) {