<!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>[12433] branches/2.9: Add required php and mysql versions to version.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12433">12433</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-17 18:46:54 +0000 (Thu, 17 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add required php and mysql versions to version.php. Future proof required version check strings. Props nacin. see <a href="http://trac.wordpress.org/ticket/11464">#11464</a> for 2.9</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches29wpadminincludesupdatecorephp">branches/2.9/wp-admin/includes/update-core.php</a></li>
<li><a href="#branches29wpincludesversionphp">branches/2.9/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches29wpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: branches/2.9/wp-admin/includes/update-core.php (12432 => 12433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.9/wp-admin/includes/update-core.php 2009-12-17 18:46:19 UTC (rev 12432)
+++ branches/2.9/wp-admin/includes/update-core.php 2009-12-17 18:46:54 UTC (rev 12433)
</span><span class="lines">@@ -219,18 +219,6 @@
</span><span class="cx">
</span><span class="cx"> @set_time_limit( 300 );
</span><span class="cx">
</span><del>- $php_version = phpversion();
- $php_compat = version_compare( $php_version, '4.3', '>=' );
- $mysql_version = $wpdb->db_version();
- $mysql_compat = version_compare( $mysql_version, '4.1.2', '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
-
- if ( !$mysql_compat && !$php_compat )
- return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress requires PHP version 4.3 or higher and MySQL version 4.1.2 or higher. You are running PHP version %1$s and MySQL version %2$s.'), $php_version, $mysql_version ) );
- elseif ( !$php_compat )
- return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress requires PHP version 4.3 or higher. You are running version %s.'), $php_version ) );
- elseif ( !$mysql_compat )
- return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress requires MySQL version 4.1.2 or higher. You are running version %s.'), $mysql_version ) );
-
</del><span class="cx"> // Sanity check the unzipped distribution
</span><span class="cx"> apply_filters('update_feedback', __('Verifying the unpacked files'));
</span><span class="cx"> if ( !$wp_filesystem->exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') ||
</span><span class="lines">@@ -239,6 +227,19 @@
</span><span class="cx"> return new WP_Error('insane_distro', __('The update could not be unpacked') );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ include( $from . '/wordpress/wp-includes/version.php' );
+ $php_version = phpversion();
+ $mysql_version = $wpdb->db_version();
+ $php_compat = version_compare( $php_version, $required_php_version, '>=' );
+ $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
+
+ if ( !$mysql_compat && !$php_compat )
+ return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) );
+ elseif ( !$php_compat )
+ return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ) );
+ elseif ( !$mysql_compat )
+ 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 ) );
+
</ins><span class="cx"> apply_filters('update_feedback', __('Installing the latest version'));
</span><span class="cx">
</span><span class="cx"> // Create maintenance file to signal that we are upgrading
</span></span></pre></div>
<a id="branches29wpincludesversionphp"></a>
<div class="modfile"><h4>Modified: branches/2.9/wp-includes/version.php (12432 => 12433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.9/wp-includes/version.php 2009-12-17 18:46:19 UTC (rev 12432)
+++ branches/2.9/wp-includes/version.php 2009-12-17 18:46:54 UTC (rev 12433)
</span><span class="lines">@@ -30,3 +30,17 @@
</span><span class="cx"> * @global string $manifest_version
</span><span class="cx"> */
</span><span class="cx"> $manifest_version = '20090616';
</span><ins>+
+/**
+ * Holds the required PHP version
+ *
+ * @global string $required_php_version
+ */
+$required_php_version = '4.3';
+
+/**
+ * Holds the required MySQL version
+ *
+ * @global string $required_mysql_version
+ */
+$required_mysql_version = '4.1.2';
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>