<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25801] trunk/src: Significantly simplify get_core_checksums(), as the caching and chunking was causing too much grief.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25801">25801</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-10-15 23:02:28 +0000 (Tue, 15 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/18201">#18201</a>. see <a href="http://core.trac.wordpress.org/ticket/22704">#22704</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php (25800 => 25801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2013-10-15 22:06:08 UTC (rev 25800)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2013-10-15 23:02:28 UTC (rev 25801)
</span><span class="lines">@@ -1251,9 +1251,6 @@
</span><span class="cx">
</span><span class="cx"> $wp_dir = trailingslashit($wp_filesystem->abspath());
</span><span class="cx">
</span><del>- // Pre-cache the checksums for the versions we care about
- get_core_checksums( array( $wp_version, $current->version ) );
-
</del><span class="cx"> $partial = true;
</span><span class="cx"> if ( $parsed_args['do_rollback'] )
</span><span class="cx"> $partial = false;
</span><span class="lines">@@ -1384,14 +1381,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function check_files() {
</span><del>- global $wp_version;
</del><ins>+ global $wp_version, $wp_local_package;
</ins><span class="cx">
</span><del>- $checksums = get_core_checksums( $wp_version );
</del><ins>+ $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
</ins><span class="cx">
</span><del>- if ( empty( $checksums[ $wp_version ] ) || ! is_array( $checksums[ $wp_version ] ) )
</del><ins>+ if ( ! is_array( $checksums ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- foreach ( $checksums[ $wp_version ] as $file => $checksum ) {
</del><ins>+ foreach ( $checksums as $file => $checksum ) {
</ins><span class="cx"> // Skip files which get updated
</span><span class="cx"> if ( 'wp-content' == substr( $file, 0, 10 ) )
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/update-core.php (25800 => 25801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/update-core.php 2013-10-15 22:06:08 UTC (rev 25800)
+++ trunk/src/wp-admin/includes/update-core.php 2013-10-15 23:02:28 UTC (rev 25801)
</span><span class="lines">@@ -696,12 +696,16 @@
</span><span class="cx">
</span><span class="cx"> // Check to see which files don't really need updating - only available for 3.7 and higher
</span><span class="cx"> if ( function_exists( 'get_core_checksums' ) ) {
</span><del>- $checksums = get_core_checksums( $wp_version );
- if ( ! empty( $checksums[ $wp_version ] ) && is_array( $checksums[ $wp_version ] ) ) {
- foreach( $checksums[ $wp_version ] as $file => $checksum ) {
</del><ins>+ $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 ) ) {
+ foreach( $checksums as $file => $checksum ) {
</ins><span class="cx"> if ( 'wp-content' == substr( $file, 0, 10 ) )
</span><span class="cx"> continue;
</span><del>- if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) === $checksum )
</del><ins>+ if ( ! file_exists( ABSPATH . $file ) )
+ continue;
+ if ( md5_file( ABSPATH . $file ) === $checksum )
</ins><span class="cx"> $skip[] = $file;
</span><span class="cx"> else
</span><span class="cx"> $check_is_writable[ $file ] = ABSPATH . $file;
</span><span class="lines">@@ -745,8 +749,8 @@
</span><span class="cx"> // Check to make sure everything copied correctly, ignoring the contents of wp-content
</span><span class="cx"> $skip = array( 'wp-content' );
</span><span class="cx"> $failed = array();
</span><del>- if ( ! empty( $checksums[ $wp_version ] ) && is_array( $checksums[ $wp_version ] ) ) {
- foreach ( $checksums[ $wp_version ] as $file => $checksum ) {
</del><ins>+ if ( is_array( $checksums ) ) {
+ foreach ( $checksums as $file => $checksum ) {
</ins><span class="cx"> if ( 0 === strpos( $file, 'wp-content' ) )
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/update.php (25800 => 25801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/update.php 2013-10-15 22:06:08 UTC (rev 25800)
+++ trunk/src/wp-admin/includes/update.php 2013-10-15 23:02:28 UTC (rev 25801)
</span><span class="lines">@@ -91,34 +91,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Gets and caches the checksums for the given versions of WordPress
</del><ins>+ * Gets and caches the checksums for the given version of WordPress.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.7.0
</span><span class="cx"> *
</span><del>- * @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
</del><ins>+ * @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.
</ins><span class="cx"> */
</span><del>-function get_core_checksums( $version ) {
- if ( ! is_array( $version ) )
- $version = array( $version );
-
</del><ins>+function get_core_checksums( $version, $locale ) {
</ins><span class="cx"> $return = array();
</span><span class="cx">
</span><del>- // 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;
- }
- }
</del><ins>+ $url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
</ins><span class="cx">
</span><del>- // 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, '&' );
-
</del><span class="cx"> if ( wp_http_supports( array( 'ssl' ) ) )
</span><span class="cx"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx">
</span><span class="lines">@@ -137,21 +122,7 @@
</span><span class="cx"> if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // 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;
</del><ins>+ return $body['checksums'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function dismiss_core_update( $update ) {
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/version.php (25800 => 25801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/version.php 2013-10-15 22:06:08 UTC (rev 25800)
+++ trunk/src/wp-includes/version.php 2013-10-15 23:02:28 UTC (rev 25801)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '3.7-beta2-25800-src';
</del><ins>+$wp_version = '3.7-beta2-25801-src';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span></span></pre>
</div>
</div>
</body>
</html>