<!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>[12578] branches/2.9/wp-admin: Check PHP and MySQL versions in install.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12578">12578</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-29 22:08:33 +0000 (Tue, 29 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check PHP and MySQL versions in install.php. see <a href="http://trac.wordpress.org/ticket/11666">#11666</a> for 2.9</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches29wpadmininstallphp">branches/2.9/wp-admin/install.php</a></li>
<li><a href="#branches29wpadminupgradephp">branches/2.9/wp-admin/upgrade.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches29wpadmininstallphp"></a>
<div class="modfile"><h4>Modified: branches/2.9/wp-admin/install.php (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.9/wp-admin/install.php 2009-12-29 22:07:35 UTC (rev 12577)
+++ branches/2.9/wp-admin/install.php 2009-12-29 22:08:33 UTC (rev 12578)
</span><span class="lines">@@ -82,6 +82,23 @@
</span><span class="cx"> // Let's check to make sure WP isn't already installed.
</span><span class="cx"> if ( is_blog_installed() ) {display_header(); die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');}
</span><span class="cx">
</span><ins>+$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 )
+ $compat = sprintf( __('You cannot install 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 )
+ $compat = sprintf( __('You cannot install 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 )
+ $compat = sprintf( __('You cannot install because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
+
+if ( !$mysql_compat || !$php_compat ) {
+ display_header();
+ die('<h1>' . __('Insufficient Requirements') . '</h1><p>' . $compat . '</p></body></html>');
+}
+
</ins><span class="cx"> switch($step) {
</span><span class="cx"> case 0:
</span><span class="cx"> case 1: // in case people are directly linking to this
</span></span></pre></div>
<a id="branches29wpadminupgradephp"></a>
<div class="modfile"><h4>Modified: branches/2.9/wp-admin/upgrade.php (12577 => 12578)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.9/wp-admin/upgrade.php 2009-12-29 22:07:35 UTC (rev 12577)
+++ branches/2.9/wp-admin/upgrade.php 2009-12-29 22:08:33 UTC (rev 12578)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> elseif ( !$php_compat )
</span><span class="cx"> printf( __('You cannot upgrade because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
</span><span class="cx"> elseif ( !$mysql_compat )
</span><del>- printf( __('You cannot upgrade because because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
</del><ins>+ printf( __('You cannot upgrade 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"> ?>
</span><span class="cx"> <?php else :
</span><span class="cx"> switch ( $step ) :
</span></span></pre>
</div>
</div>
</body>
</html>