<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[11714] trunk/wp-includes/update.php:
Hide update notification for themes that are updated manually,
props Denis-de-Bernardy, fixes #10220</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11714">11714</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-07-14 08:34:39 +0000 (Tue, 14 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hide update notification for themes that are updated manually, props Denis-de-Bernardy, fixes <a href="http://trac.wordpress.org/ticket/10220">#10220</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 (11713 => 11714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/update.php 2009-07-14 08:20:24 UTC (rev 11713)
+++ trunk/wp-includes/update.php 2009-07-14 08:34:39 UTC (rev 11714)
</span><span class="lines">@@ -201,7 +201,36 @@
</span><span class="cx"> $timeout = 'load-themes.php' == current_filter() ? 3600 : 43200; //Check for updated every 60 minutes if hitting the themes page, Else, check every 12 hours
</span><span class="cx"> $time_not_changed = isset( $current_theme->last_checked ) && $timeout > ( time( ) - $current_theme->last_checked );
</span><span class="cx">
</span><del>- if( $time_not_changed )
</del><ins>+ $themes = array();
+ $checked = array();
+ $themes['current_theme'] = (array) $current_theme;
+ foreach( (array) $installed_themes as $theme_title => $theme ) {
+ $themes[$theme['Stylesheet']] = array();
+ $checked[$theme['Stylesheet']] = $theme['Version'];
+
+ foreach( (array) $theme as $key => $value ) {
+ $themes[$theme['Stylesheet']][$key] = $value;
+ }
+ }
+
+ $theme_changed = false;
+ foreach ( $checked as $slug => $v ) {
+ $new_option->checked[ $slug ] = $v;
+
+ if ( !isset( $current_theme->checked[ $slug ] ) || strval($current_theme->checked[ $slug ]) !== strval($v) )
+ $theme_changed = true;
+ }
+
+ if ( isset ( $current_theme->response ) && is_array( $current_theme->response ) ) {
+ foreach ( $current_theme->response as $slug => $update_details ) {
+ if ( ! isset($checked[ $slug ]) ) {
+ $theme_changed = true;
+ break;
+ }
+ }
+ }
+
+ if( $time_not_changed && !$theme_changed )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Update last_checked for current to prevent multiple blocking requests if request hangs
</span><span class="lines">@@ -210,16 +239,6 @@
</span><span class="cx">
</span><span class="cx"> $current_theme->template = get_option( 'template' );
</span><span class="cx">
</span><del>- $themes = array( );
- $themes['current_theme'] = (array) $current_theme;
- foreach( (array) $installed_themes as $theme_title => $theme ) {
- $themes[$theme['Stylesheet']] = array( );
-
- foreach( (array) $theme as $key => $value ) {
- $themes[$theme['Stylesheet']][$key] = $value;
- }
- }
-
</del><span class="cx"> $options = array(
</span><span class="cx"> 'timeout' => 3,
</span><span class="cx"> 'body' => array( 'themes' => serialize( $themes ) ),
</span><span class="lines">@@ -235,8 +254,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $response = unserialize( $raw_response['body'] );
</span><del>- if( $response )
</del><ins>+ if( $response ) {
+ $new_option->checked = $checked;
</ins><span class="cx"> $new_option->response = $response;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set_transient( 'update_themes', $new_option );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>