<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[17619] trunk/wp-includes/update.php: Ensure that the Update API'
s are always using a non-modified $wp_version.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17619">17619</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-04-07 10:04:45 +0000 (Thu, 07 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that the Update API's are always using a non-modified $wp_version. Props nacin. Fixes <a href="http://trac.wordpress.org/ticket/14384">#14384</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 (17618 => 17619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/update.php 2011-04-07 09:56:20 UTC (rev 17618)
+++ trunk/wp-includes/update.php 2011-04-07 10:04:45 UTC (rev 17619)
</span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx"> if ( defined('WP_INSTALLING') )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- global $wp_version, $wpdb, $wp_local_package;
</del><ins>+ global $wpdb, $wp_local_package;
+ include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
</ins><span class="cx"> $php_version = phpversion();
</span><span class="cx">
</span><span class="cx"> $current = get_site_transient( 'update_core' );
</span><span class="lines">@@ -119,7 +120,7 @@
</span><span class="cx"> * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
</span><span class="cx"> */
</span><span class="cx"> function wp_update_plugins() {
</span><del>- global $wp_version;
</del><ins>+ include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
</ins><span class="cx">
</span><span class="cx"> if ( defined('WP_INSTALLING') )
</span><span class="cx"> return false;
</span><span class="lines">@@ -203,8 +204,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
</span><span class="cx"> */
</span><del>-function wp_update_themes( ) {
- global $wp_version;
</del><ins>+function wp_update_themes() {
+ include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
</ins><span class="cx">
</span><span class="cx"> if ( defined( 'WP_INSTALLING' ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -290,7 +291,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _maybe_update_core() {
</span><del>- global $wp_version;
</del><ins>+ include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
</ins><span class="cx">
</span><span class="cx"> $current = get_site_transient( 'update_core' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>