<!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>[22227] trunk/wp-admin/includes/update-core.php: Replace the hard coded version and PHP/MySQL requirements in update-core.php by pulling in the new version.php file during installation.</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/22227">22227</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2012-10-14 03:47:36 +0000 (Sun, 14 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace the hard coded version and PHP/MySQL requirements in update-core.php by pulling in the new version.php file during installation. Fixes <a href="http://core.trac.wordpress.org/ticket/22015">#22015</a> <a href="http://core.trac.wordpress.org/ticket/11639">#11639</a>. See <a href="http://core.trac.wordpress.org/ticket/21789">#21789</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesupdatecorephp">trunk/wp-admin/includes/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update-core.php (22226 => 22227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update-core.php 2012-10-14 02:14:17 UTC (rev 22226)
+++ trunk/wp-admin/includes/update-core.php 2012-10-14 03:47:36 UTC (rev 22227)
</span><span class="lines">@@ -614,11 +614,34 @@
</span><span class="cx">
</span><span class="cx"> @set_time_limit( 300 );
</span><span class="cx">
</span><ins>+ // Sanity check the unzipped distribution
+ apply_filters( 'update_feedback', __('Verifying the unpacked files&#8230;') );
+ $distro = '';
+ $roots = array( '/wordpress/', '/wordpress-mu/' );
+ foreach ( $roots as $root ) {
+ if ( $wp_filesystem->exists( $from . $root . 'readme.html' ) && $wp_filesystem->exists( $from . $root . 'wp-includes/version.php' ) ) {
+ $distro = $root;
+ break;
+ }
+ }
+ if ( ! $distro ) {
+ $wp_filesystem->delete( $from, true );
+ return new WP_Error( 'insane_distro', __('The update could not be unpacked') );
+ }
+
+ // Import $wp_version, $required_php_version, and $required_mysql_version from the new version
+ $versions_file = $wp_filesystem->wp_content_dir() . 'upgrade/version-current.php';
+ if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
+ $wp_filesystem->delete( $from, true );
+ return new WP_Error( 'copy_failed', __('Could not copy file.') );
+ }
+
+ $wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE );
+ require_once( WP_CONTENT_DIR . '/upgrade/version-current.php' );
+ $wp_filesystem->delete( $versions_file );
+
</ins><span class="cx"> $php_version = phpversion();
</span><span class="cx"> $mysql_version = $wpdb->db_version();
</span><del>- $required_php_version = '5.2.4';
- $required_mysql_version = '5.0';
- $wp_version = '3.4';
</del><span class="cx"> $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from
</span><span class="cx"> $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // a dash in the version indicates a Development release
</span><span class="cx"> $php_compat = version_compare( $php_version, $required_php_version, '>=' );
</span><span class="lines">@@ -637,21 +660,6 @@
</span><span class="cx"> elseif ( !$mysql_compat )
</span><span class="cx"> return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
</span><span class="cx">
</span><del>- // Sanity check the unzipped distribution
- apply_filters('update_feedback', __('Verifying the unpacked files&#8230;'));
- $distro = '';
- $roots = array( '/wordpress/', '/wordpress-mu/' );
- foreach( $roots as $root ) {
- if ( $wp_filesystem->exists($from . $root . 'readme.html') && $wp_filesystem->exists($from . $root . 'wp-includes/version.php') ) {
- $distro = $root;
- break;
- }
- }
- if ( !$distro ) {
- $wp_filesystem->delete($from, true);
- return new WP_Error('insane_distro', __('The update could not be unpacked') );
- }
-
</del><span class="cx"> apply_filters('update_feedback', __('Installing the latest version&#8230;'));
</span><span class="cx">
</span><span class="cx"> // Create maintenance file to signal that we are upgrading
</span></span></pre>
</div>
</div>
</body>
</html>