<!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>[19312] trunk/wp-includes/update.php: Revert update changes that snuck in with [19311].</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, #logmsg > ol { margin-left: 0; 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/19312">19312</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-11-16 07:23:15 +0000 (Wed, 16 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert update changes that snuck in with <a href="http://core.trac.wordpress.org/changeset/19311">[19311]</a>. see <a href="http://core.trac.wordpress.org/ticket/19255">#19255</a>, see <a href="http://core.trac.wordpress.org/ticket/18876">#18876</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesupdatephp">trunk/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/update.php (19311 => 19312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/update.php 2011-11-16 01:58:13 UTC (rev 19311)
+++ trunk/wp-includes/update.php 2011-11-16 07:23:15 UTC (rev 19312)
</span><span class="lines">@@ -143,37 +143,31 @@
</span><span class="cx">
</span><span class="cx"> $new_option = new stdClass;
</span><span class="cx"> $new_option->last_checked = time();
</span><ins>+ // Check for updated every 60 minutes if hitting update pages; else, check every 12 hours.
+ $timeout = in_array( current_filter(), array( 'load-plugins.php', 'load-update.php', 'load-update-core.php' ) ) ? 3600 : 43200;
+ $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
</ins><span class="cx">
</span><del>- // Check for updated every 12 hours, 60 minutes, or immediately, depending on the page.
- $filter = current_filter();
- if ( 'load-update-core.php' != $filter ) {
- $timeout = 'load-plugins.php' == $filter || 'load-update.php' == $filter ? 3600 : 43200;
- $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
</del><ins>+ $plugin_changed = false;
+ foreach ( $plugins as $file => $p ) {
+ $new_option->checked[ $file ] = $p['Version'];
</ins><span class="cx">
</span><del>- if ( $time_not_changed ) {
- $plugin_changed = false;
- foreach ( $plugins as $file => $p ) {
- $new_option->checked[ $file ] = $p['Version'];
-
- if ( !isset( $current->checked[ $file ] ) || strval($current->checked[ $file ]) !== strval($p['Version']) )
- $plugin_changed = true;
- }
</del><ins>+ if ( !isset( $current->checked[ $file ] ) || strval($current->checked[ $file ]) !== strval($p['Version']) )
+ $plugin_changed = true;
+ }
</ins><span class="cx">
</span><del>- if ( isset ( $current->response ) && is_array( $current->response ) ) {
- foreach ( $current->response as $plugin_file => $update_details ) {
- if ( ! isset($plugins[ $plugin_file ]) ) {
- $plugin_changed = true;
- break;
- }
- }
</del><ins>+ if ( isset ( $current->response ) && is_array( $current->response ) ) {
+ foreach ( $current->response as $plugin_file => $update_details ) {
+ if ( ! isset($plugins[ $plugin_file ]) ) {
+ $plugin_changed = true;
+ break;
</ins><span class="cx"> }
</span><del>-
- // Bail if we've checked recently and if nothing has changed
- if ( ! $plugin_changed )
- return false;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Bail if we've checked in the last 12 hours and if nothing has changed
+ if ( $time_not_changed && !$plugin_changed )
+ return false;
+
</ins><span class="cx"> // Update last_checked for current to prevent multiple blocking requests if request hangs
</span><span class="cx"> $current->last_checked = time();
</span><span class="cx"> set_site_transient( 'update_plugins', $current );
</span><span class="lines">@@ -228,6 +222,10 @@
</span><span class="cx"> if ( ! is_object($last_update) )
</span><span class="cx"> $last_update = new stdClass;
</span><span class="cx">
</span><ins>+ // Check for updated every 60 minutes if hitting update pages; else, check every 12 hours.
+ $timeout = in_array( current_filter(), array( 'load-themes.php', 'load-update.php', 'load-update-core.php' ) ) ? 3600 : 43200;
+ $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time( ) - $last_update->last_checked );
+
</ins><span class="cx"> $themes = array();
</span><span class="cx"> $checked = array();
</span><span class="cx"> $exclude_fields = array('Template Files', 'Stylesheet Files', 'Status', 'Theme Root', 'Theme Root URI', 'Template Dir', 'Stylesheet Dir', 'Description', 'Tags', 'Screenshot');
</span><span class="lines">@@ -248,36 +246,26 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Check for updated every 12 hours, 60 minutes, or immediately, depending on the page.
- $filter = current_filter();
- if ( 'load-update-core.php' != $filter ) {
- $timeout = 'load-themes.php' == $filter || 'load-update.php' == $filter ? 3600 : 43200;
- $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time( ) - $last_update->last_checked );
</del><ins>+ $theme_changed = false;
+ foreach ( $checked as $slug => $v ) {
+ $update_request->checked[ $slug ] = $v;
</ins><span class="cx">
</span><del>- if ( $time_not_changed ) {
- $theme_changed = false;
- foreach ( $checked as $slug => $v ) {
- $update_request->checked[ $slug ] = $v;
-
- if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
- $theme_changed = true;
- }
</del><ins>+ if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
+ $theme_changed = true;
+ }
</ins><span class="cx">
</span><del>- if ( isset ( $last_update->response ) && is_array( $last_update->response ) ) {
- foreach ( $last_update->response as $slug => $update_details ) {
- if ( ! isset($checked[ $slug ]) ) {
- $theme_changed = true;
- break;
- }
- }
</del><ins>+ if ( isset ( $last_update->response ) && is_array( $last_update->response ) ) {
+ foreach ( $last_update->response as $slug => $update_details ) {
+ if ( ! isset($checked[ $slug ]) ) {
+ $theme_changed = true;
+ break;
</ins><span class="cx"> }
</span><del>-
- // Bail if we've checked recently and if nothing has changed
- if ( ! $theme_changed )
- return false;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( $time_not_changed && !$theme_changed )
+ return false;
+
</ins><span class="cx"> // Update last_checked for current to prevent multiple blocking requests if request hangs
</span><span class="cx"> $last_update->last_checked = time();
</span><span class="cx"> set_site_transient( 'update_themes', $last_update );
</span></span></pre>
</div>
</div>
</body>
</html>